Merge pull request #21 from eastfire/gh-pages

Merge pull request #20 from eastfire/master
Merge pull request #22 from eastfire/master

Merge pull request #21 from eastfire/gh-pages