typo corrections
formatting update
Merge branch 'develop' into gh-pages