New features

Nadja Geislerrequested to merge
new_features into master

Integrate and clean up features temporarily introduced into master

Merge request reports