fixed setup.py classififer
Merge branch 'dev'