Python 3 modifications
Merge pull request #7 from mok0/master

Python 3 modifications