fix a bug on setup.py
Merge branch 'master' into v0.97rc