integ 17/12 #4
Merge pull request #435 from VincentCharpentier/Vincent

integ 17/12 #4