Merge pull request #3 from failedxyz/master

Master
Merge pull request #5 from failedxyz/gh-pages

Merge pull request #3 from failedxyz/master