Update documentation
Merge branch 'master' into gh-pages
Another attempt at publishing
Update documentation