Merge pull request #1 from RomeshPanditha/master

Merge changes to personal fork