Fixes for python 2.6 compatibility
Merge pull request #370 from mauler/feature-py26

Fixes for python 2.6 compatibility