Merge pull request #2 from bbowen/master

Merge pull request #1 from bbowen/gh-pages