Implements #755
Merge pull request #758 from emmanuel-keller/master

Implements #755