Fixes #204
Merge pull request #212 from jpav/master

Fixes #204