Merge pull request #3 from RomeshPanditha/master

Merge back into personal fork