diff --git a/README.md b/README.md
index 2990e43..571d711 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,11 @@ The following features are planned to be included in the final version:
 - [x] Webpack and Webpack-Dev-Server, including hot-loader
 - [x] Babel and JSX
 - [x] Mocha Unit tests (*optional*)
-- [ ] React.Router
 - [x] EsLint Support
 - [x] No dependency on grunt, gulp or the next hot taskrunner!
 
 ## Todo
+- [ ] Better performance for webpack builds
 - [ ] The dynamic webpack configuration is clunky, there must be a better way to do that!
 - [ ] Karmas webpack configuration is not included in the global webpack.config.js file, but it really should
 
diff --git a/karma.conf.js b/karma.conf.js
index 9c5bb02..a4bee36 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -23,7 +23,7 @@ module.exports = function(config) {
     },
     webpack: {
       cache: true,
-      devtool: 'inline-source-map',
+      devtool: 'eval',
       module: {
         loaders: [
           {
@@ -33,7 +33,10 @@ module.exports = function(config) {
           {
             test: /\.(js|jsx)$/,
             loader: 'babel-loader',
-            exclude: /node_modules/
+            include: [
+              path.join(__dirname, 'src'),
+              path.join(__dirname, 'test')
+            ]
           }
         ]
       },
diff --git a/webpack.config.js b/webpack.config.js
index a6e7ff1..8799221 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -37,7 +37,7 @@ var config = {
     preLoaders: [
       {
         test: /\.(js|jsx)$/,
-        exclude: /node_modules/,
+        include: path.join(__dirname, 'src'),
         loader: 'eslint-loader'
       }
     ],
@@ -59,7 +59,7 @@ switch(env) {
   case 'dist':
     config.entry = './src/components/run';
     config.cache = false;
-    config.devtool = false;
+    config.devtool = 'sourcemap';
     config.plugins = [
       new webpack.optimize.DedupePlugin(),
       new webpack.optimize.UglifyJsPlugin(),
@@ -83,7 +83,7 @@ switch(env) {
       './src/components/run'
     ];
     config.cache = true;
-    config.devtool = 'sourcemap';
+    config.devtool = 'eval';
     config.plugins = [
       new webpack.HotModuleReplacementPlugin(),
       new webpack.NoErrorsPlugin()