Great changes!!!

Thank you Aymeric for the great changes you have implemented this last week :-)