Merged with Edouard's modifications

2011-05-16, laurent