Updated to be compatible with Grout 0.1.*