Updated to Grinder v0.6.1