Simpler fix for #63
Merge pull request #64 from eile/master

Simpler fix for #63