Python 2.5 compatibility #261
Merge pull request #342 from davidwtbuxton/master

Python 2.5 compatibility, fixes #261