Merge pull request #3 from maceface/master

don't know what I'm doing
Merge pull request #4 from maceface/gh-pages

????