update setup.py

update setup.py
Merge branch 'dev'