Almost ready for v0.9.1