Backport pr #81 into 0.9.x

Fixes #35.
Merging this as-is and I'll make the changes afterwards. Just wanted to get this in so we can consider Whisper "finished" for `0.9.13`. :smile_cat: