Merge pull request #2 from roachhd/master

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

Merge pull request #2 from roachhd/master