Fixes #204
Merge pull request #432 from anserran/fix204

Fixes #204