Update setup.py
Merge branch 'master' into dev
fixed waitForResult on server shutdown
Merge branch 'dev' into devGUI