Merge pull request #21 from hsoft/py3