Bug fix and python 2.6 support