Fixes #230
Merge pull request #231 from bleporini/master

Fixes #230