diff --git a/nodes/core/core/89-trigger.html b/nodes/core/core/89-trigger.html
index 165e09d8d..c3bb4f2f7 100644
--- a/nodes/core/core/89-trigger.html
+++ b/nodes/core/core/89-trigger.html
@@ -56,6 +56,13 @@
         </ul>
     </div>
     <br/>
+    <div class="form-row">
+        <label data-i18n="trigger.for" for="node-input-bytopic"></label>
+        <select id="node-input-bytopic">
+            <option value="all" data-i18n="trigger.alltopics"></option>
+            <option value="topic" data-i18n="trigger.bytopics"></option>
+        </select>
+    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name"></input>
@@ -103,6 +110,7 @@
             extend: {value:"false"},
             units: {value:"ms"},
             reset: {value:""},
+            bytopic: {value: "all"},
             name: {value:""}
         },
         inputs:1,
diff --git a/nodes/core/core/89-trigger.js b/nodes/core/core/89-trigger.js
index 5314645a0..1f616e7dd 100644
--- a/nodes/core/core/89-trigger.js
+++ b/nodes/core/core/89-trigger.js
@@ -19,6 +19,7 @@ module.exports = function(RED) {
     var mustache = require("mustache");
     function TriggerNode(n) {
         RED.nodes.createNode(this,n);
+        this.bytopic = n.bytopic || "all";
         this.op1 = n.op1 || "1";
         this.op2 = n.op2 || "0";
         this.op1type = n.op1type || "str";
@@ -47,7 +48,7 @@ module.exports = function(RED) {
         this.extend = n.extend || "false";
         this.units = n.units || "ms";
         this.reset = n.reset || '';
-        this.duration = parseInt(n.duration);
+        this.duration = parseFloat(n.duration);
         if (isNaN(this.duration)) {
             this.duration = 250;
         }
@@ -73,21 +74,24 @@ module.exports = function(RED) {
         //catch(e) { this.op2 = this.op2; }
 
         var node = this;
-        var tout = null;
-        var m2;
+        node.topics = {};
+
         this.on("input", function(msg) {
+            var topic = msg.topic || "_none";
+            if (node.bytopic === "all") { topic = "_none"; }
+            node.topics[topic] = node.topics[topic] || {};
             if (msg.hasOwnProperty("reset") || ((node.reset !== '') && (msg.payload == node.reset)) ) {
-                if (node.loop === true) { clearInterval(tout); }
-                else { clearTimeout(tout); }
-                tout = null;
+                if (node.loop === true) { clearInterval(node.topics[topic].tout); }
+                else { clearTimeout(node.topics[topic].tout); }
+                delete node.topics[topic];
                 node.status({});
             }
             else {
-                if (((!tout) && (tout !== 0)) || (node.loop === true)) {
-                    if (node.op2type === "pay" || node.op2type === "payl") { m2 = msg.payload; }
-                    else if (node.op2Templated) { m2 = mustache.render(node.op2,msg); }
+                if (((!node.topics[topic].tout) && (node.topics[topic].tout !== 0)) || (node.loop === true)) {
+                    if (node.op2type === "pay" || node.op2type === "payl") { node.topics[topic].m2 = RED.util.cloneMessage(msg.payload); }
+                    else if (node.op2Templated) { node.topics[topic].m2 = mustache.render(node.op2,msg); }
                     else if (node.op2type !== "nul") {
-                        m2 = RED.util.evaluateNodeProperty(node.op2,node.op2type,node,msg);
+                        node.topics[topic].m2 = RED.util.evaluateNodeProperty(node.op2,node.op2type,node,msg);
                     }
 
                     if (node.op1type === "pay") { }
@@ -98,56 +102,58 @@ module.exports = function(RED) {
 
                     if (node.op1type !== "nul") { node.send(msg); }
 
-                    if (node.duration === 0) { tout = 0; }
+                    if (node.duration === 0) { node.topics[topic].tout = 0; }
                     else if (node.loop === true) {
-                        if (tout) { clearInterval(tout); }
+                        if (node.topics[topic].tout) { clearInterval(node.topics[topic].tout); }
                         if (node.op1type !== "nul") {
                             var msg2 = RED.util.cloneMessage(msg);
-                            tout = setInterval(function() { node.send(msg2); },node.duration);
+                            node.topics[topic].tout = setInterval(function() { node.send(msg2); }, node.duration);
                         }
                     }
                     else {
-                        tout = setTimeout(function() {
+                        node.topics[topic].tout = setTimeout(function() {
                             if (node.op2type !== "nul") {
                                 var msg2 = RED.util.cloneMessage(msg);
                                 if (node.op2type === "flow" || node.op2type === "global") {
-                                    m2 = RED.util.evaluateNodeProperty(node.op2,node.op2type,node,msg);
+                                    node.topics[topic].m2 = RED.util.evaluateNodeProperty(node.op2,node.op2type,node,msg);
                                 }
-                                msg2.payload = m2;
+                                msg2.payload = node.topics[topic].m2;
                                 node.send(msg2);
                             }
-                            tout = null;
+                            delete node.topics[topic];
                             node.status({});
-                        },node.duration);
+                        }, node.duration);
                     }
                     node.status({fill:"blue",shape:"dot",text:" "});
                 }
                 else if ((node.extend === "true" || node.extend === true) && (node.duration > 0)) {
-                    if (tout) { clearTimeout(tout); }
-                    if (node.op2type === "payl") { m2 = msg.payload; }
-                    tout = setTimeout(function() {
+                    if (node.topics[topic].tout) { clearTimeout(node.topics[topic].tout); }
+                    if (node.op2type === "payl") { node.topics[topic].m2 = RED.util.cloneMessage(msg.payload); }
+                    node.topics[topic].tout = setTimeout(function() {
                         if (node.op2type !== "nul") {
                             var msg2 = RED.util.cloneMessage(msg);
                             if (node.op2type === "flow" || node.op2type === "global") {
-                                m2 = RED.util.evaluateNodeProperty(node.op2,node.op2type,node,msg);
+                                node.topics[topic].m2 = RED.util.evaluateNodeProperty(node.op2,node.op2type,node,msg);
                             }
-                            msg2.payload = m2;
+                            msg2.payload = node.topics[topic].m2;
                             node.send(msg2);
                         }
-                        tout = null;
+                        delete node.topics[topic];
                         node.status({});
-                    },node.duration);
+                    }, node.duration);
                 }
                 else {
-                    if (node.op2type === "payl") { m2 = msg.payload; }
+                    if (node.op2type === "payl") { node.topics[topic].m2 = msg.payload; }
                 }
             }
         });
         this.on("close", function() {
-            if (tout) {
-                if (node.loop === true) { clearInterval(tout); }
-                else { clearTimeout(tout); }
-                tout = null;
+            for (var t in node.topics) {
+                if (node.topics[t]) {
+                    if (node.loop === true) { clearInterval(node.topics[t].tout); }
+                    else { clearTimeout(node.topics[t].tout); }
+                    delete node.topics[t];
+                }
             }
             node.status({});
         });
diff --git a/nodes/core/locales/en-US/messages.json b/nodes/core/locales/en-US/messages.json
index 113ddfdca..6728db7c1 100644
--- a/nodes/core/locales/en-US/messages.json
+++ b/nodes/core/locales/en-US/messages.json
@@ -270,6 +270,9 @@
         "wait-reset": "wait to be reset",
         "wait-for": "wait for",
         "wait-loop": "resend it every",
+        "for": "Handling",
+        "bytopics": "each msg.topic independently",
+        "alltopics": "all messages",
         "duration": {
             "ms": "Milliseconds",
             "s": "Seconds",