#317 applying rlouapre's change to the dev branch
Merge pull request #321 from dmcassel/dev

#317 applying rlouapre's change to the dev branch