Make instructions a bit clearer and more responsive.
Merge origin/gh-pages into gh-pages