Merging with Edouard's modifications

2011-10-17, laurent