Update documentation
Merge branch 'gh-pages'
Update documentation
Merge branch 'gh-pages'
Update documentation
Merge branch 'gh-pages'
Update documentation
Fixed merge conflicts on open-source para