Merge pull request #2 from jashort/master

Python3 compatibility