Use correct type
Merge pull request #142 from jbergstroem/py3k-pyformat

Use correct type
Merge pull request #144 from hfalcic/py3k

Python 3 fixes