#317 reversing PR #318, as it incorrectly went to the master branch
Merge pull request #320 from dmcassel/master

#317 reversing PR #318, as it incorrectly went to the master branch