Updated for 0.9.7.3 release