Issue #20 as a pull request

I tried the trick described in Issue #20, and it seems to work on my machine.