IMPROVED: python2.6 support