Merge pull request #16 from coogie/gh-pages

We never kept master up to date, lol
Merge pull request #17 from coogie/master

Merge pull request #16 from coogie/gh-pages