Update documentation
Merge remote-tracking branch 'github/master' into gh-pages
Update documentation