shortened title to fit page
Merge branch 'master' into gh-pages