make the setup.py file py3 compatible
Merge branch 'python3'