bill stuff
Merge pull request #16 from HarrisonDempsey/master

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

Merge back into personal fork