Implements #292
Merge pull request #321 from emmanuel-keller/1.5

Implements #292