Merge pull request #1 from RomeshPanditha/master

Merge changes to personal fork
Merge pull request #5 from HarrisonDempsey/master

Merge pull request #1 from RomeshPanditha/master