Updated with new documentation
Merge branch 'gh-pages-v2.1' into gh-pages