py3 fixes - compatible with py2
Merge pull request #23 from jkowalleck/py3fix

py3 fixes - compatible with py2