Bugfixes
Update documentation
Merge branch 'hotfix/bugfixes'