fix setup.py and increment version #
Merge remote-tracking branch 'origin/master'