Update setup.py
Merge pull request #1 from lpetrov/master

Update setup.py
Merge branch 'master' into features_merge