Merge pull request #55 from fgenolini/gh-pages

wrd
Merge pull request #56 from fgenolini/master

Merge pull request #55 from fgenolini/gh-pages