fixes #95

M
Merge pull request #24 from msimonin/fix95

fixes #95
Merge branch 'maint-2.1.0'