Python3 compatibility
Merge pull request #13 from gcq/upstream

Python3 compatibility