Fixes #166
Merge pull request #176 from jpav/master

Fixes #166