diff --git a/pom.xml b/pom.xml
index 2039be4..7ff0841 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>info.istlab.IoTP</groupId>
   <artifactId>IoTP</artifactId>
   <packaging>jar</packaging>
-  <version>0.31</version>
+  <version>0.32</version>
   <name>IoTP</name>
   <url>http://maven.apache.org</url>
 
diff --git a/src/main/java/info/istlab/IoTP/Launcher.java b/src/main/java/info/istlab/IoTP/Launcher.java
index 06644d6..5474bd6 100644
--- a/src/main/java/info/istlab/IoTP/Launcher.java
+++ b/src/main/java/info/istlab/IoTP/Launcher.java
@@ -26,7 +26,7 @@
 public class Launcher extends JFrame implements MouseInputListener, KeyListener, Runnable {
 
     public static Launcher theapp;
-    public static String version = "0.31";
+    public static String version = "0.32";
     static int reboot_msec = 2000;
     // JPanel mainP;
     File root;
diff --git a/src/main/java/info/istlab/IoTP/MQTTClient.java b/src/main/java/info/istlab/IoTP/MQTTClient.java
index 95c7603..9cdfcac 100644
--- a/src/main/java/info/istlab/IoTP/MQTTClient.java
+++ b/src/main/java/info/istlab/IoTP/MQTTClient.java
@@ -217,6 +217,7 @@
 
         MqttConnectOptions connOpts = new MqttConnectOptions();
         connOpts.setCleanSession(false);
+        client.setTimeToWait(10000);
 
         System.out.println("Connecting to broker:" + broker);
         client.connect(connOpts);
diff --git a/src/main/java/info/istlab/IoTP/MqttWindow.java b/src/main/java/info/istlab/IoTP/MqttWindow.java
index ab8c607..c067002 100644
--- a/src/main/java/info/istlab/IoTP/MqttWindow.java
+++ b/src/main/java/info/istlab/IoTP/MqttWindow.java
@@ -233,6 +233,7 @@
             jta.setBackground(Color.gray);
         }
         connectB.setText("Connect");
+        MqttWindow.theMqttWindow = null;
         if (Launcher.theapp == null)
             System.exit(0);
         else