Add Python 2.6 compatibility
Merge branch 'add-py26-support'