Merge pull request #12 from TopherJonesy/gh-pages

Merge pull request #11 from TopherJonesy/master
Merge pull request #13 from TopherJonesy/master

Merge pull request #12 from TopherJonesy/gh-pages