Updated for 0.9.8.1 release