Now compatible with both Python 2 and 3