Fix issue #293
Merge pull request #295 from emmanuel-keller/master

Fix issue #293