- more tweaking of formatting
Merge branch 'master' into gh-pages
Updated documentation.