Rev 2

Merged Tobias Meisel requested to merge rev_2 into master

Merge request reports