Fixed setup.py to work with different python versions
Merge branch 'hotfix/fix_package'