Merge pull request #14 from eastfire/master

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

Merge pull request #14 from eastfire/master