Merge pull request #1 from jtenner/master

Apply changes
Merge pull request #2 from jtenner/gh-pages

Merge pull request #1 from jtenner/master