Merge pull request #1 from cdibble/master

>?
Merge pull request #2 from cdibble/gh-pages

Merge pull request #1 from cdibble/master