Updated for 0.9.8.2 release