Quoting role name - #112

This is #112 rebased on top of the latest master.