Updated for Python 2.7