Now works with Python 3