For 0.9.0

I took the opportunity to patch for 0.9.0.