Merge pull request #51 from fgenolini/gh-pages

doh!
Merge pull request #52 from fgenolini/master

Merge pull request #51 from fgenolini/gh-pages