Merge pull request #28 from eastfire/master

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

Merge pull request #28 from eastfire/master