rewording and typo on index
Merge branch 'master' into gh-pages