Fixed setup.py

Merged Danijel Schorlemmer requested to merge feature/fix_setup.py into master

\approve @fd

Edited by Danijel Schorlemmer

Merge request reports