Expand documentation a little bit
Merge branch 'master' into gh-pages
Minor documentation fixes
Merge branch 'master' into gh-pages