Added support for Python 2 as well