last commits

Sebastien could you pull my last changes on the Master repository?