new func
new func

Conflicts:
	setup.py