Changed the setup.py function
Merge remote-tracking branch 'origin/master'