Merge pull request #49 from fgenolini/gh-pages

eh?
Merge pull request #50 from fgenolini/master

Merge pull request #49 from fgenolini/gh-pages