Merge pull request #7 from quattromani/gh-pages

Merge gh-pages and master
Merge pull request #8 from quattromani/master

Merge pull request #7 from quattromani/gh-pages