Made some small corrections of things I found while reading the documentation.
Merge branch 'master' into development