Ready for 0.9.5