Merge pull request #1 from cooljeanius/gh-pages

pull from gh-pages
Merge pull request #2 from cooljeanius/gh-pages

pull from gh-pages