Merge pull request #1 from zefferno/master

Update
Merge pull request #2 from zefferno/gh-pages

Merge pull request #1 from zefferno/master