Merge pull request #8 from Frozenfire92/master

Merge pull request #7 from Frozenfire92/gh-pages