merge py3 support