Merge pull request #7 from RomeshPanditha/master

Merge back into personal fork
Merge pull request #13 from HarrisonDempsey/master

Merge pull request #7 from RomeshPanditha/master