Implements #473
Merge pull request #475 from emmanuel-keller/master

Implements #473