Merged with Edouard's modifications

2011-03-27, laurent