Update to 0.0-6