Making it PyPi ready