Update to 0.40