diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..2e12714
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
index 28b5e41..37051c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+/.idea
+
 /node_modules
-/npm-debug.log
\ No newline at end of file
+/npm-debug.log
diff --git a/Plugin.js b/Plugin.js
index faccef1..d216ffa 100644
--- a/Plugin.js
+++ b/Plugin.js
@@ -1,8 +1,11 @@
-'use strict';
+'use strict'
 
 class ExtractFilePlugin {
+
     apply(compiler) {
+
         compiler.plugin('this-compilation', (compilation) => {
+
             compilation.plugin('normal-module-loader', (loaderContext, module) => {
                 loaderContext[__dirname] = () => {
                     module.meta[__dirname] = true;
@@ -11,7 +14,7 @@ class ExtractFilePlugin {
 
             compilation.plugin('additional-assets', callback => {
                 compilation.chunks.forEach(chunk => {
-                    chunk.modules.forEach(module => processModule(chunk, module));
+                    chunk.forEachModule(module => processModule(chunk, module));
                 });
 
                 callback();
@@ -21,22 +24,28 @@ class ExtractFilePlugin {
 }
 
 function processModule(chunk, ourModule) {
+
     if (ourModule.meta && ourModule.meta[__dirname]) {
+
+        let moduleFound = false;
+
         // let's find module, which was issued by ours (proxied module)
-        chunk.modules.some((module) => {
-            if (module.reasons.some(reason => reason.module === ourModule)) {
+        chunk.forEachModule((module) => {
+
+            if (!moduleFound && module.reasons.some(reason => reason.module === ourModule)) {
                 // add assets from that module
                 addAssets(chunk, module);
                 // break cycle
-                return true;
+                moduleFound = true;
             }
         });
     }
 }
 
 function addAssets(chunk, module) {
+
     // add any emitted assets via proxied module to this chunk
-    for (var file in module.assets) {
+    for (let file in module.assets) {
         chunk.files.push(file);
     }
 }
diff --git a/README.md b/README.md
index 0894dab..467a073 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,15 @@ not added to the chunk files
 - this loader is used as a proxy to include this emitted file in the chunk
 so it's available in generated manifest
 
+# Install
+
+```bash
+# for webpack 3
+npm install --save-dev extract-text-webpack-plugin
+# for webpack 1, 2
+npm install --save-dev extract-text-webpack-plugin@0.1.0
+```
+
 ## Usage
 
 ```js
diff --git a/package.json b/package.json
index e7b745b..a014f39 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,17 @@
 {
     "name": "extract-file-loader",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "author": "Marius Balčytis",
     "description": "Loader and plugin for webpack to add proxied asset as a chunk file",
     "dependencies": {
         "loader-utils": "~0.2.5"
     },
     "devDependencies": {
-        "assets-webpack-plugin": "^3.2.0",
-        "file-loader": "^0.8.4",
-        "image-webpack-loader": "^2.0.0",
+        "assets-webpack-plugin": "^3.5.0",
+        "file-loader": "^1.0.0-beta",
+        "image-webpack-loader": "^3",
         "mocha": "^3.0.2",
-        "webpack": "^1.13.2"
+        "webpack": "^3"
     },
     "engines": {
         "node": ">=4"
diff --git a/test/webpack.config.js b/test/webpack.config.js
index 849cdab..93e6b77 100644
--- a/test/webpack.config.js
+++ b/test/webpack.config.js
@@ -20,13 +20,16 @@ module.exports = {
         new AssetsPlugin({filename: 'manifest.json', path: outputDir})
     ],
     module: {
-        preLoaders: [{
-            test: /\.(gif|png|jpe?g|svg)$/i,
-            loader: 'image-webpack'
-        }],
-        loaders: [{
-            test: /\.(gif|png|jpe?g|svg)$/i,
-            loader: 'file?name=[name].optimized.[ext]'
-        }]
+        rules: [
+            {
+                enforce: 'pre',
+                test: /\.(gif|png|jpe?g|svg)$/i,
+                loader: 'image-webpack-loader'
+            },
+            {
+                test: /\.(gif|png|jpe?g|svg)$/i,
+                loader: 'file-loader?name=[name].optimized.[ext]'
+            },
+        ],
     }
-};
\ No newline at end of file
+};