Merge #422
Merge pull request #423 from emmanuel-keller/master

Merge #422