fix some titles and name
Merge branch 'master' into gh-pages