Updated to work with grunt