Merge pull request #34 from eastfire/master

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

Merge pull request #34 from eastfire/master