Feature/grunt a little quicker

Note: Do not merge in, until _after_ @rarila's patch has been merged in successfully.