python2.6 compatibility
Merge pull request #52 from wardi/master

Python 2.6 compatibility fix