Fixing merge for adding_grunt branch