Updated for 0.9.7.5 release