Update to v 0.6.0