py3k fixes
Merge pull request #105 from xcolour/py3k

py3k fixes