Forel&gildas - little merge

:D