apply xcoulon's PR #117, merged into master >> master