Feature/grunt conversion