Implements #803
Merge pull request #806 from emmanuel-keller/master

Implements #803