merge latest from MIR_1_0 branch + fix indentation of 1.1 stuff