Fix for #95.
Merge pull request #97 from hermanolsson/master

Fix for #95