Make this branch compatible with both Py2 and Py3