Added support for Python 2 and 3