proposal to fix issue #113 at upstream
Merge pull request #114 from osallou/master

Patch proposal to fix #113