Merge pull request #68 from kif/master

keep it compatible with python 2.6