Merge pull request #11 from devinmatte/gh-pages

Merge pull request #10 from devinmatte/master
Merge pull request #12 from devinmatte/master

Merge pull request #11 from devinmatte/gh-pages