Merge pull request #4 from PoopFeast6969/master

Merge Master into gh-pages.