Merge pull request #7 from quattromani/gh-pages

Merge gh-pages and master