Make it run on python 2.6 too
Merge branch 'python26compatible'