made it 2.7 compatible
Merge branch 'tp9-master'