diff --git a/lib/index.js b/lib/index.js
index 3d439fe9..d6cf2a1e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -106,6 +106,13 @@ function start(cliOptions) { // eslint-disable-line complexity
           query: {
             name: filename.static
           }
+        },
+        {
+          test: /\.(svg)(\?.*)?$/,
+          loader: 'file-loader',
+          query: {
+            name: filename.static
+          }
         }
       ].concat(loaders.styleLoaders(cssOptions))
     },
@@ -249,7 +256,7 @@ function start(cliOptions) { // eslint-disable-line complexity
   if (typeof options.webpack === 'function') {
     webpackConfig = options.webpack(webpackConfig)
   } else if (typeof options.webpack === 'object') {
-    webpackConfig = webpackMerge(webpackConfig, options.webpack)
+    webpackConfig = webpackMerge.smart(webpackConfig, options.webpack)
   }
 
   const server = run(webpackConfig, options)