Merge pull request #6 from silshack/gh-pages

MERGE IT
Merge pull request #7 from EmBeeBee/gh-pages2

Merge pull request #6 from silshack/gh-pages