Merge pull request #12 from eastfire/master

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

Merge pull request #12 from eastfire/master