Correct grammar for error count
Clarify options
Merge branch 'master' into gh-pages