Fixes #75
Merge pull request #80 from vjpr/bug-75

Fixes #75