Merge pull request #36 from eastfire/master

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

Merge pull request #36 from eastfire/master