Update Setup

Merged Holger Niemann requested to merge Holgers into master

Merge request reports