commit du 25/11
Merge amelioration