diff --git a/.gitignore b/.gitignore
index 007eb90..f06a52b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Remove config
 /config/
 
+.idea
 .gradle
 **/build/
 !src/**/build/
diff --git a/autonick.iml b/autonick.iml
new file mode 100644
index 0000000..a589521
--- /dev/null
+++ b/autonick.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+        <projectReimportVersion>1</projectReimportVersion>
+      </configuration>
+    </facet>
+  </component>
+</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b046137..b5b8dec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,19 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>de.jan.autonick.AutoNick</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
         </plugins>
         <resources>
             <resource>
diff --git a/src/main/java/de/jan/autonick/AutoNick.java b/src/main/java/de/jan/autonick/AutoNick.java
index 1317dc0..ebc484e 100644
--- a/src/main/java/de/jan/autonick/AutoNick.java
+++ b/src/main/java/de/jan/autonick/AutoNick.java
@@ -1,15 +1,9 @@
 package de.jan.autonick;
 
+import de.jan.autonick.commands.NickCommand;
 import de.jan.autonick.config.AutoNickConfiguration;
 import de.jan.autonick.database.DatabaseRegistry;
-import de.jan.autonick.commands.NickCommand;
-import de.jan.autonick.listener.InventoryClickListener;
-import de.jan.autonick.listener.PlayerChatListener;
-import de.jan.autonick.listener.PlayerInteractListener;
-import de.jan.autonick.listener.PlayerJoinListener;
-import de.jan.autonick.listener.PlayerQuitListener;
-import org.bstats.bukkit.Metrics;
-import org.bstats.charts.SimplePie;
+import de.jan.autonick.listener.*;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -52,9 +46,9 @@ public void onEnable() {
         }
 
         /*     METRICS     */
-        final int pluginId = 8730;
-        final Metrics metrics = new Metrics(this, pluginId);
-        metrics.addCustomChart(new SimplePie("bungeecord", () -> String.valueOf(configuration.isBungeeCord())));
+        //final int pluginId = 8730;
+        //final Metrics metrics = new Metrics(this, pluginId);
+        //metrics.addCustomChart(new SimplePie("bungeecord", () -> String.valueOf(configuration.isBungeeCord())));
     }
 
     @Override
diff --git a/src/main/java/de/jan/autonick/config/AutoNickConfiguration.java b/src/main/java/de/jan/autonick/config/AutoNickConfiguration.java
index 2bab5ba..8c66545 100644
--- a/src/main/java/de/jan/autonick/config/AutoNickConfiguration.java
+++ b/src/main/java/de/jan/autonick/config/AutoNickConfiguration.java
@@ -3,7 +3,6 @@
 import de.jan.autonick.AutoNick;
 
 import java.io.*;
-import java.nio.charset.StandardCharsets;
 
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -18,13 +17,7 @@ public class AutoNickConfiguration {
     public AutoNickConfiguration(AutoNick plugin) {
         plugin.saveDefaultConfig();
 
-        try {
-            this.configuration = YamlConfiguration.loadConfiguration(
-                    new BufferedReader(new InputStreamReader(new FileInputStream(new File(plugin.getDataFolder(), "config.yml")), StandardCharsets.UTF_8)));
-        } catch (FileNotFoundException ex) {
-            ex.printStackTrace();
-            return;
-        }
+        this.configuration = YamlConfiguration.loadConfiguration(new File(plugin.getDataFolder(), "config.yml"));
 
         this.bungeeCord = this.getBoolean("bungeecord");
     }