for ever
fix some words
Merge branch 'master' into gh-pages