Merge pull request #121 from jfly/master

converted to python3