Merge pull request #1 from Kaceykaso/gh-pages

Merge gh-pages changes with Master