Merge pull request #1 from Camillealbouy/master

Just two minor modifications
Ref 3, replies 1 and 2
Ref 3, last replies
Merge pull request #2 from tpoisot/master

Replies to referee 3
Merge pull request #1 from DominiqueGravel/master

merge dom-> cam