expanded setuptools support
merge changes