Merge pull request #4 from quattromani/gh-pages

Merge gh-pages and master