Merge pull request #954 from emmanuel-keller/master

Fixes #947
Merge pull request #958 from emmanuel-keller/master

Implements #955