Updated for 0.9.7.16 release