Updated to use master branch of rock.