Merge pull request #26 from eastfire/master

update
Merge pull request #27 from eastfire/gh-pages

Merge pull request #26 from eastfire/master