Updated with grunt build