Fixed some errors occuring on python 2.7.5
Merge pull request #1 from hds/master

Added python 2.6+ compatibility