Cross statistics fixes

Peter Lünenschloßrequested to merge
crossStatisticsFixes into develop

adresses/closes issues #217 (closed) and #302 (closed)

Edited by Peter Lünenschloß

Merge request reports