Feature/grunt integration