CQM: changes from André's review (16.03.2014).