Critiques/2011-01-18/Sug7

2012-03-20 preplan: agreed