Merge pull request #2 from gato333/gh-pages

Merge pull request #1 from gato333/master