Merge pull request #264 from apdavison/py3

Add support for Python 3