Merge pull request #23 from bdrung/master

Support Python 3