Merge pull request #1 from eastfire/master

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

Merge pull request #1 from eastfire/master