Update to 0.6