Fixed some typos.
made less ugly
Merge branch 'master' into gh-pages