07: minor rewordings
Merge branch 'master' into gh-pages