Merge pull request #109 from akkie/master

A better fix for #104
Fixes #105