Updates to make the release 0.0.6 ready