Merge pull request #2 from shuttle099/master

Merge 2.
Merge pull request #3 from shuttle099/gh-pages

Merge pull request #2 from shuttle099/master