minor edits
Merge branch 'master' into gh-pages

'minor edits'