Added support for Python 2