Updated for 0.9.7.13 release