Updating with support for python 2.5