Merge pull request #8 from HarrisonDempsey/master

Merge into master