More Python 3 compliance
Merge pull request #2 from rf152/master

More Python 3 compliance