Merge pull request #2 from bbowen/master

Merge pull request #1 from bbowen/gh-pages
Merge pull request #3 from bbowen/gh-pages

Merge pull request #2 from bbowen/master