Fix a fatal error about setup.py
Merge branch 'dev'