Updates to work with PyPi