Update to work with Python 3 now

Tested on Python 2.7 and 3.3