Merge pull request #1 from Kaceykaso/gh-pages

Merge gh-pages changes with Master
Merge pull request #2 from Kaceykaso/master

Merge pull request #1 from Kaceykaso/gh-pages