generic improvements

David Schäferrequested to merge
generic3 into develop

closes #289 (closed), #290 (closed)

Edited by David Schäfer

Merge request reports