changed setup.py
Merge branch '00.00.04' into 00.00.05

Conflicts:
	setup.py