Merge pull request #18 from eastfire/master

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

Merge pull request #18 from eastfire/master