Make this work on Python 2.7
Merge pull request #5 from bwhitman/master

Make this work on Python 2.7