0.9.x

I'm happy with this fix; please pull if you agree. Thanks!