Added support for python 2.x