Finished Feat#003

Merged Leander Wendt requested to merge Feat#0003 into master

Merge request reports