adaptions to ms2
Merge remote-tracking branch 'origin/feature_v_0.2' into feature_v_0.2