Refixed setup.py (was broken because of the last rebasement)