Improves setup.py
Merge pull request #5571 from ricardoquesada/setup_py_fixes

Improves setup.py