FIX: Fix for py2.6
Merge pull request #1065 from Eric89GXL/py26

FIX: Fix for py2.6