Update documentation
Merge branch 'update_documentation' into develop