Basic start to automation using Grunt
Merge fix