added a direct import of Roller to simplify import statements
merge