Merge pull request #1 from HappyRave/master

merge
Merge pull request #3 from HappyRave/gh-pages

Merge pull request #1 from HappyRave/master