Merge pull request #140 from sport-monkey/master

Compatibility for Python 3
Merge remote-tracking branch 'upstream/master'