Merge pull request #1 from Quadrophone/master

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

Merge pull request #1 from Quadrophone/master