Fix #172
Merge pull request #176 from emmanuel-keller/master

Fix #172