Update Brocfile.js as well as issue tracking