Updated for python 2.7.6