Fix py3 compatibility issues
Merge pull request #62 from google/py3

Fix py3 compatibility issues