Fixes #87
Merge pull request #91 from juliema/issue-87

Fixes #87