Fix/documentation

Merged Thomas Fetzer requested to merge fix/documentation into master

Merge request reports