Extend docs a bit
Merge branch 'master-doc' into gh-pages
Rebuild