Update the setup.py

Conflicts:
	setup.py