Final changes for pypi. [0.6.0]