Fix some formatting
Merge branch 'master' into gh-pages
Update docs