Merge pull request #3 from devinmatte/master

Merge pull request #2 from devinmatte/gh-pages
Merge pull request #4 from devinmatte/master

Master
Merge pull request #5 from devinmatte/gh-pages

Merge