Merge pull request #4 from quattromani/gh-pages

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

Merge pull request #4 from quattromani/gh-pages