Resolve "Mixed sampling types"

lukas leufen requested to merge lukas_issue197_feat_mixed-sampling into develop

Closes #197 (closed)

Edited by lukas leufen

Merge request reports