Merge pull request #16 from eastfire/master

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

Merge pull request #16 from eastfire/master