Quick (and slightly dirty) update for 0.9.0.