Changed "about" text
Merge branch 'master' into gh-pages