Fixes issue #264
Merge pull request #270 from emmanuel-keller/1.5

Fixes issue #264