Fixes #174
Merge pull request #193 from jpav/master

Fixes #174