Merge pull request #13 from gayanW/dev