Merge pull request #335 from mAiNiNfEcTiOn/gh-pages

Fixes issue #334

Good pull. Now come and find me, I have a virtual bounty for you ;)