Made some small corrections of things I found while reading the documentation.
Merge branch 'master' into development
Merge pull request #268 from MarioVilas/development

Made some small corrections of things I found while reading the documentation.