Merge pull request #5 from Pingendo/gh-pages

Merge pull request #3 from Pingendo/master
Merge pull request #6 from Pingendo/master

Merge pull request #5 from Pingendo/gh-pages