Fixes issue #91 without breaking python 2.7

Fixes issue #91