Upgraded for 0.9.7.18 release