Now supports python 2.6