removed python 2.5 compatability
Merge remote-tracking branch 'origin/master'