Fixes issue #181
Merge pull request #193 from theikkila/master

Fixed issue #181