ready for 0.9.6