03: Some Rewording, Some additions
Merge branch 'master' into gh-pages