Updated for 0.9.8.4 release