Merge pull request #5 from pjkundert/master

Python 2 Compatibility