Merge pull request #5 from mamoru/master

Some Python3 fixes
Fix #7: No map in Python3