Merge pull request #30 from eastfire/master

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

Merge pull request #30 from eastfire/master