Merge pull request #24 from eastfire/master

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

Merge pull request #24 from eastfire/master