More py3k support
Merge pull request #12 from xantares/py3k

More py3k support