Implementation of #350
Merge pull request #353 from emmanuel-keller/1.5

Implementation of #350