Update documentation
Update documentation
Merge branch 'master' into gh-pages