Rework kl

Merged Philipp Arras requested to merge rework_kl into NIFTy_7

Merge request reports