diff --git a/app/package.json b/app/package.json
index 96aa2a8..05bc722 100644
--- a/app/package.json
+++ b/app/package.json
@@ -5,7 +5,8 @@
   "main": "lib/main.js",
   "dependencies": {
     "electron-window-state": "^2.0.0",
-    "wurl": "^2.1.0"
+    "wurl": "^2.1.0",
+    "source-map-support": "^0.4.0"
   },
   "devDependencies": {},
   "scripts": {
diff --git a/app/src/main.js b/app/src/main.js
index 61cc605..d7adccf 100644
--- a/app/src/main.js
+++ b/app/src/main.js
@@ -2,6 +2,8 @@
  * Created by JiaHao on 4/7/15.
  */
 
+import 'source-map-support/register';
+
 var fs = require('fs');
 var path = require('path');
 var electron = require('electron');
diff --git a/webpack.config.js b/webpack.config.js
index 751210b..0f15948 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -28,5 +28,6 @@ module.exports = {
         loaders: [
             {test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader'}
         ]
-    }
+    },
+    devtool: 'source-map'
 };