Updated for PyPi guidelines