Added support for python 2