Merge with Edouard's Modifications

2012-02-15, laurent