diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js
index ce47b97c9..307071f66 100644
--- a/UI/WebServerResources/Gruntfile.js
+++ b/UI/WebServerResources/Gruntfile.js
@@ -50,14 +50,17 @@ module.exports = function(grunt) {
             '<%= src %>/angular-foundation/mm-foundation-tpls<%= min %>.js',
             '<%= src %>/foundation/js/foundation<%= min %>.js',
             '<%= src %>/ionic/release/js/ionic<%= min %>.js',
-            '<%= src %>/underscore/underscore-min.js'
+            '<%= src %>/underscore/underscore-min.*'
         ];
-        for (var i = 0; i < js.length; i++) {
-            var src = grunt.template.process(js[i], {data: options});
-            var paths = src.split('/');
-            var dest = options.js_dest + paths[paths.length-1];
-            grunt.file.copy(src, dest);
-            grunt.log.ok("copy " + src + " => " + dest);
+        for (var j = 0; j < js.length; j++) {
+            var files = grunt.file.expand(grunt.template.process(js[j], {data: options}))
+            for (var i = 0; i < files.length; i++) {
+                var src = files[i];
+                var paths = src.split('/');
+                var dest = options.js_dest + paths[paths.length-1];
+                grunt.file.copy(src, dest);
+                grunt.log.ok("copy " + src + " => " + dest);
+            }
         }
         var fonts = grunt.file.expand(
             grunt.template.process('<%= src %>/ionic/release/fonts/ionicons.*',
diff --git a/UI/WebServerResources/package.json b/UI/WebServerResources/package.json
index bf218d636..510b40ee8 100644
--- a/UI/WebServerResources/package.json
+++ b/UI/WebServerResources/package.json
@@ -5,6 +5,7 @@
         "bower": ">=1.3.8",
         "node-sass": ">=0.7.0",
         "grunt": ">=0.4.1",
+        "grunt-cli": ">=0.1.11",
         "grunt-contrib-watch": ">=0.5.3",
         "grunt-sass": ">=0.8.0"
     }