Fixes #169
Merge pull request #209 from jpav/master

Fixes #169