Changed to be PyPi compliant