Updated for 0.9.7.9 release