updated 0.9.7 branch