Actually make work with Python 3..