Update documentation
Merge branch 'hotfix/docs_update'