Fixes #131
Merge pull request #210 from anserran/fix131

Fixes #131