Merge pull request #3 from b79789/master

merge 2 to gh-pages
Merge pull request #4 from b79789/gh-pages

Merge pull request #3 from b79789/master