Added support for Python 2.x and 3.x