Merge pull request #8 from HarrisonDempsey/master

Merge into master
Merge pull request #5 from RomeshPanditha/master

Merge pull request #8 from HarrisonDempsey/master