Fixes #217
Merge pull request #218 from jpav/master

Fixes #217