Merge pull request #7 from RomeshPanditha/master