Fix a typo and clarify a sentence
Merge branch 'master' into gh-pages