diff --git a/src/main/java/examples/Example6.java b/src/main/java/examples/AddAndModify.java
similarity index 92%
rename from src/main/java/examples/Example6.java
rename to src/main/java/examples/AddAndModify.java
index f186da0..74b75f5 100644
--- a/src/main/java/examples/Example6.java
+++ b/src/main/java/examples/AddAndModify.java
@@ -7,10 +7,10 @@ import me.legrange.mikrotik.MikrotikApiException;
  *
  * @author gideon
  */
-public class Example6 extends Example {
+public class AddAndModify extends Example {
 
     public static void main(String... args) throws Exception {
-        Example6 ex = new Example6();
+        AddAndModify ex = new AddAndModify();
         ex.connect();
         ex.test();
         ex.disconnect();
diff --git a/src/main/java/examples/Example4.java b/src/main/java/examples/AsyncCommand.java
similarity index 93%
rename from src/main/java/examples/Example4.java
rename to src/main/java/examples/AsyncCommand.java
index cdda4b1..20ad3be 100644
--- a/src/main/java/examples/Example4.java
+++ b/src/main/java/examples/AsyncCommand.java
@@ -9,10 +9,10 @@ import me.legrange.mikrotik.ResultListener;
  *
  * @author gideon
  */
-public class Example4 extends Example {
+public class AsyncCommand extends Example {
 
     public static void main(String... args) throws Exception {
-        Example4 ex = new Example4();
+        AsyncCommand ex = new AsyncCommand();
         ex.connect();
         ex.test();
         ex.disconnect();
diff --git a/src/main/java/examples/Example5.java b/src/main/java/examples/AsyncWithErrorHandling.java
similarity index 88%
rename from src/main/java/examples/Example5.java
rename to src/main/java/examples/AsyncWithErrorHandling.java
index 32dd190..78c59c5 100644
--- a/src/main/java/examples/Example5.java
+++ b/src/main/java/examples/AsyncWithErrorHandling.java
@@ -9,10 +9,10 @@ import me.legrange.mikrotik.ResultListener;
  *
  * @author gideon
  */
-public class Example5 extends Example {
+public class AsyncWithErrorHandling extends Example {
 
     public static void main(String... args) throws Exception {
-        Example5 ex = new Example5();
+        AsyncWithErrorHandling ex = new AsyncWithErrorHandling();
         ex.connect();
         ex.test();
         ex.disconnect();
@@ -23,6 +23,7 @@ public class Example5 extends Example {
        String id = con.execute("/interface/wireless/monitor .id=wlan1", new ResultListener() {
            private int prev = 0;
 
+           @Override
            public void receive(Map<String, String> result) {
                int val = Integer.parseInt(result.get("signal-strength"));
                String sym = (val == prev) ? " " : ((val < prev) ? "-" : "+");
@@ -30,11 +31,13 @@ public class Example5 extends Example {
                prev = val;
            }
 
+           @Override
            public void error(MikrotikApiException ex) {
                System.out.printf("An error ocurred: %s\n", ex.getMessage());
                ex.printStackTrace();
            }
 
+           @Override
            public void completed() {
                System.out.printf("The request has been completed\n");
            }
diff --git a/src/main/java/examples/Example3.java b/src/main/java/examples/CommandWithWhere.java
similarity index 85%
rename from src/main/java/examples/Example3.java
rename to src/main/java/examples/CommandWithWhere.java
index f1380bd..9a62219 100644
--- a/src/main/java/examples/Example3.java
+++ b/src/main/java/examples/CommandWithWhere.java
@@ -9,10 +9,10 @@ import me.legrange.mikrotik.MikrotikApiException;
  *
  * @author gideon
  */
-public class Example3 extends Example {
+public class CommandWithWhere extends Example {
 
     public static void main(String... args) throws Exception {
-        Example3 ex = new Example3();
+        CommandWithWhere ex = new CommandWithWhere();
         ex.connect();
         ex.test();
         ex.disconnect();
diff --git a/src/main/java/examples/Config.java b/src/main/java/examples/Config.java
index 7497b21..57c81aa 100644
--- a/src/main/java/examples/Config.java
+++ b/src/main/java/examples/Config.java
@@ -8,8 +8,8 @@ public class Config {
     
     
    public static final String HOST = "192.168.1.34";
-    public static final String USERNAME = "admin";
-    public static final String PASSWORD = "";
+    public static final String USERNAME = "gideon";
+    public static final String PASSWORD = "minapp";
     
  
 }
diff --git a/src/main/java/examples/Example7.java b/src/main/java/examples/DownloadConfig.java
similarity index 88%
rename from src/main/java/examples/Example7.java
rename to src/main/java/examples/DownloadConfig.java
index c81a0e2..a43b09c 100644
--- a/src/main/java/examples/Example7.java
+++ b/src/main/java/examples/DownloadConfig.java
@@ -9,10 +9,10 @@ import me.legrange.mikrotik.MikrotikApiException;
  *
  * @author gideon
  */
-public class Example7 extends Example {
+public class DownloadConfig extends Example {
 
     public static void main(String... args) throws Exception {
-        Example7 ex = new Example7();
+        DownloadConfig ex = new DownloadConfig();
         ex.connect();
         ex.test();
         ex.disconnect();
diff --git a/src/main/java/examples/Example8.java b/src/main/java/examples/Example8.java
deleted file mode 100644
index 37ef4eb..0000000
--- a/src/main/java/examples/Example8.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package examples;
-
-import java.util.List;
-import java.util.Map;
-import me.legrange.mikrotik.MikrotikApiException;
-
-/**
- * Example 7: Dump your complete config
- *
- * @author gideon
- */
-public class Example8 extends Example {
-
-    public static void main(String... args) throws Exception {
-        Example8 ex = new Example8();
-        ex.connect();
-        ex.test();
-        ex.disconnect();
-    }
-
-    private void test() throws MikrotikApiException, InterruptedException {
-       List<Map<String, String>> res = con.execute("/ip/hotspot/user/print where uptime!=1");
-        for (Map<String, String> r : res) {
-            System.out.println(r);
-        } 
-//        con.execute("/ip/firewall/filter/add chain=forward hotspot=!auth protocol=tcp src-port=8000-8084");
-    }
-}
diff --git a/src/main/java/examples/Example1.java b/src/main/java/examples/SimpleCommand.java
similarity index 82%
rename from src/main/java/examples/Example1.java
rename to src/main/java/examples/SimpleCommand.java
index 038c7a9..a68d18a 100644
--- a/src/main/java/examples/Example1.java
+++ b/src/main/java/examples/SimpleCommand.java
@@ -6,10 +6,10 @@ import me.legrange.mikrotik.MikrotikApiException;
  * Example 1: A very simple command: Reboot the remote router
  * @author gideon
  */
-public class Example1 extends Example {
+public class SimpleCommand extends Example {
     
         public static void main(String...args) throws Exception {
-            Example1 ex = new Example1();
+            SimpleCommand ex = new SimpleCommand();
             ex.connect();
             ex.test();
             ex.disconnect();
diff --git a/src/main/java/examples/Example2.java b/src/main/java/examples/SimpleCommandWithResults.java
similarity index 83%
rename from src/main/java/examples/Example2.java
rename to src/main/java/examples/SimpleCommandWithResults.java
index 95f63a8..604e185 100644
--- a/src/main/java/examples/Example2.java
+++ b/src/main/java/examples/SimpleCommandWithResults.java
@@ -9,10 +9,10 @@ import me.legrange.mikrotik.MikrotikApiException;
  *
  * @author gideon
  */
-public class Example2 extends Example {
+public class SimpleCommandWithResults extends Example {
 
     public static void main(String... args) throws Exception {
-        Example2 ex = new Example2();
+        SimpleCommandWithResults ex = new SimpleCommandWithResults();
         ex.connect();
         ex.test();
         ex.disconnect();
diff --git a/src/main/java/examples/Example9.java b/src/main/java/examples/TryWithResources.java
similarity index 84%
rename from src/main/java/examples/Example9.java
rename to src/main/java/examples/TryWithResources.java
index b9917ee..492028a 100644
--- a/src/main/java/examples/Example9.java
+++ b/src/main/java/examples/TryWithResources.java
@@ -1,7 +1,5 @@
 package examples;
 
-import java.util.List;
-import java.util.Map;
 import me.legrange.mikrotik.ApiConnection;
 import me.legrange.mikrotik.MikrotikApiException;
 
@@ -10,10 +8,10 @@ import me.legrange.mikrotik.MikrotikApiException;
  *
  * @author gideon
  */
-public class Example9  {
+public class TryWithResources  {
 
     public static void main(String... args) throws Exception {
-        Example9 ex = new Example9();
+        TryWithResources ex = new TryWithResources();
         ex.test();
     }
 
diff --git a/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java b/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java
index 1443707..3afa2e3 100644
--- a/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java
+++ b/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java
@@ -242,6 +242,7 @@ public final class ApiConnectionImpl extends ApiConnection {
                     } catch (InterruptedException ex2) {
                     }
                 } catch (ApiConnectionException | InterruptedException ex) {
+                    ex.printStackTrace();
                 }
             }
         }