diff --git a/Gruntfile.js b/Gruntfile.js
index d0215a1..f6d0cec 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -185,10 +185,11 @@
                 }
             }
         },
+        //Watches and builds for _development_ (source maps)
         watch: {
             scripts: {
                 files: ['<%= dirs.src %>/**/*.js'],
-                tasks: ['concat'],
+                tasks: ['concat_sourcemap'],
                 options: {
                     spawn: false,
                 }
@@ -214,6 +215,6 @@
     grunt.registerTask('travis', ['build', 'test']);
 
     grunt.registerTask('default', ['build', 'test']);
-
-    grunt.registerTask('debug-watch', ['concat', 'watch']);
+    
+    grunt.registerTask('debug-watch', ['concat_sourcemap', 'watch:debug']);
 };

diff --git a/Gruntfile.js b/Gruntfile.js
index d0215a1..f6d0cec 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -185,10 +185,11 @@
                 }
             }
         },
+        //Watches and builds for _development_ (source maps)
         watch: {
             scripts: {
                 files: ['<%= dirs.src %>/**/*.js'],
-                tasks: ['concat'],
+                tasks: ['concat_sourcemap'],
                 options: {
                     spawn: false,
                 }
@@ -214,6 +215,6 @@
     grunt.registerTask('travis', ['build', 'test']);
 
     grunt.registerTask('default', ['build', 'test']);
-
-    grunt.registerTask('debug-watch', ['concat', 'watch']);
+    
+    grunt.registerTask('debug-watch', ['concat_sourcemap', 'watch:debug']);
 };
diff --git a/package.json b/package.json
index 898d369..f8ef52d 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
         "karma-chrome-launcher": "~0.1",
         "karma-firefox-launcher": "~0.1",
         "karma-mocha": "~0.1",
-        "karma-spec-reporter": "~0.0.6"
+        "karma-spec-reporter": "~0.0.6",
+        "grunt-contrib-watch": "~0.5.3"
     }
 }