Fix typos and add a notice
Fix typos and add a notice
Merge branch 'master' into gh-pages