updated the setup.py
Merge branch 'master' into github-public

getting the last changes from master
: