Update to 0.9