Better Python 2 support
Merge pull request #3 from portify/master

Better Python 2 support