Update documentation
Merge branch 'hotfix/documentation'