Correct setup for sumbitting to pypi
More fixes for the setup