Fixes issue #78
Merge pull request #103 from akkie/master

Fixes issue #78