Updated for 0.9.7.0 release