Merge pull request #98 from frapontillo/gh-pages-fork