Fixed to run on Python 2.7 and 3.4