Merging with modifications from Edouard

2012-01-17, laurent