Added support for both Python 2.x and 3.x