diff --git a/public/javascripts/laufschrift.js b/public/javascripts/laufschrift.js
index 26c47fd..3bc465d 100644
--- a/public/javascripts/laufschrift.js
+++ b/public/javascripts/laufschrift.js
@@ -71,8 +71,10 @@ $(document).ready(function() {
                         $('#schalter').html('Laufschrift <b>AUS</b> schalten');
                         $('#status').text('EIN');
                         $('#laufzeile').addClass('machrot');
-                        $('#auszeit').text(data.offtime);
-                        $('#auszeile').show();
+                        if(data.offtime != undefined) {
+                            $('#auszeit').text(data.offtime);
+                            $('#auszeile').show();
+                        }
                     } else {
                         $('#schalter').html('Laufschrift <b>EIN</b> schalten');
                         $('#status').text('AUS');
diff --git a/public/javascripts/version.js b/public/javascripts/version.js
index f36cc78..eb559a6 100644
--- a/public/javascripts/version.js
+++ b/public/javascripts/version.js
@@ -1,7 +1,7 @@
 // VersiosNummern und -Geschichte
 
-var VERSION="1.0";
-var VDATE="2019-04-05";
+var VERSION="1.1";
+var VDATE="2019-04-10";
 
 /* History 
 
diff --git a/routes/switch.js b/routes/switch.js
index 2c083ae..3f7e13f 100644
--- a/routes/switch.js
+++ b/routes/switch.js
@@ -15,12 +15,14 @@ let MQTTHOST = process.env.MQTTHOST;
 let MQTTPORT = process.env.MQTTPORT;
 let MQTTUSR = process.env.MQTTUSR;
 let MQTTPWD = process.env.MQTTPWD;
+let TOPIC=process.env.TOPIC;
 
 
 if (MQTTHOST === undefined) { MQTTHOST = 'localhost';}
 if (MQTTPORT === undefined) { MQTTPORT = 1883;}
 if (MQTTUSR === undefined) { MQTTUSR = "";}
 if (MQTTPWD === undefined) { MQTTPWD = "";}
+if (TOPIC === undefined) { TOPIC = "sonoff";}
 
 /*
 if (MQTTHOST === undefined) { MQTTHOST = 'laufschrift.rexfue.de';}
@@ -42,12 +44,15 @@ console.log("Start: ", moment().format("YYYY-MM-DD HH:mm"));
 client.on('connect', function() {
     connected = true;
     retur.connect = 'connected';
-    client.subscribe('stat/laufschrift/POWER');
+    client.subscribe('stat/'+TOPIC+'/POWER');
 })
 
 client.on('message',function(topix,message) {
     relais = message.toString();
     console.log("Status = ",relais);
+    if (relais == 'OFF') {
+        delete retur.offtime;
+    }
     retur.relais = relais;
 });
 
@@ -77,14 +82,13 @@ doPublish("");
 
 function doPublish(payload) {
 //    retur.relais='pending';
-    client.publish('cmnd/laufschrift/Power',payload);
+    client.publish('cmnd/'+TOPIC+'/Power',payload);
     if (payload == 'On') {
-        offtime = moment().add(brenndauer,'s').format("HH.mm");
-        tio =setTimeout(doPublish,brenndauer*1000,"Off");
+        offtime = moment().add(brenndauer, 's').format("HH.mm");
+        tio = setTimeout(doPublish, brenndauer * 1000, "Off");
         retur.offtime = offtime;
     } else if (payload == 'Off') {
         clearTimeout(tio);
-        delete retur.offtime;
     }
 }
 // end MQTT