Merge pull request #10 from eastfire/master

update2
Merge pull request #11 from eastfire/gh-pages

Merge pull request #10 from eastfire/master