Fixes #224
Merge pull request #233 from jpav/master

Fixes #224