Fixes #225.
Merge pull request #234 from jpav/master

Fixes #225.