Updated to python-r1