Added compatibility with Python 3.x