fix setup.py

fix setup.py
Merge branch 'dev'