Ready for v0.6