Updated for 0.9.7.14 release