diff --git a/nodes/core/logic/10-switch.html b/nodes/core/logic/10-switch.html
index e64aadfa7..bc59f7c94 100644
--- a/nodes/core/logic/10-switch.html
+++ b/nodes/core/logic/10-switch.html
@@ -29,34 +29,41 @@
         </div>
         <a href="#" class="btn btn-mini" id="node-input-add-rule" style="margin-top: 4px;"><i class="icon-plus"></i> Add</a>
     </div>
-    
+    <div>
+        <select id="node-input-checkall" style="width:100%; margin-right:5px;">
+            <option value="true">checking all rules</option>
+            <option value="false">stopping after first match</option>
+        </select>
+    </div>
 </script>
 
 <script type="text/x-red" data-help-name="switch">
-	<p>A simple function node to route messages based on its properties.</p>
-	<p>When a message arrives, the selected property is evaluated against each
-	of the defined rules. The message is then sent to the output of <i>all</i>
-	rules that pass.</p>
+    <p>A simple function node to route messages based on its properties.</p>
+    <p>When a message arrives, the selected property is evaluated against each
+    of the defined rules. The message is then sent to the output of <i>all</i>
+    rules that pass.</p>
+    <p>Note: the <i>otherwise</i> rule applies as a "not any of" the rules preceeding it.</p>
 </script>
 
 <script type="text/javascript">
-    RED.nodes.registerType('switch',{
-        color:"#E2D96E",
+    RED.nodes.registerType('switch', {
+        color: "#E2D96E",
         category: 'function',
         defaults: {
             name: {value:""},
-            property: {value: "payload",required:true},
-            rules:{value:[{t:"eq",v:""}]},
-            outputs:{value:1}
+            property: {value:"payload", required:true},
+            rules: {value:[{t:"eq", v:""}]},
+            checkall: {value:"true", required:true},
+            outputs: {value:1}
         },
-        inputs:1,
-        outputs:1,
+        inputs: 1,
+        outputs: 1,
         icon: "switch.png",
         label: function() {
             return this.name;
         },
         oneditprepare: function() {
-        
+
             var operators = [
                 {v:"eq",t:"=="},
                 {v:"neq",t:"!="},
@@ -70,30 +77,29 @@
                 {v:"true",t:"is true"},
                 {v:"false",t:"is false"},
                 {v:"null",t:"is null"},
-                {v:"nnull",t:"is not null"}
+                {v:"nnull",t:"is not null"},
+                {v:"else",t:"otherwise"}
             ];
-            
+
             function generateRule(i,rule) {
                 var container = $('<li/>',{style:"margin:0; padding:8px 0px; border-bottom: 1px solid #ccc;"});
                 var row = $('<div/>').appendTo(container);
                 var row2 = $('<div/>',{style:"padding-top: 5px; text-align: right;"}).appendTo(container);
-                
+
                 var selectField = $('<select/>',{style:"width:120px; margin-left: 5px; text-align: center;"}).appendTo(row);
                 for (var d in operators) {
                     selectField.append($("<option></option>").val(operators[d].v).text(operators[d].t));
                 }
-                
+
                 var valueField = $('<input/>',{class:"node-input-rule-value",type:"text",style:"margin-left: 5px; width: 145px;"}).appendTo(row);
-                
                 var btwnField = $('<span/>').appendTo(row);
                 var btwnValueField = $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"margin-left: 5px; width: 50px;"}).appendTo(btwnField);
                 btwnField.append(" and ");
                 var btwnValue2Field = $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"width: 50px;margin-left:2px;"}).appendTo(btwnField);
-                
-                 
+
                 var finalspan = $('<span/>',{style:"float: right; margin-top: 3px;margin-right: 10px;"}).appendTo(row);
                 finalspan.append(' send to <span class="node-input-rule-index">'+i+'</span> ');
-                
+
                 selectField.change(function() {
                     var type = selectField.children("option:selected").val();
                     if (type.length < 4) {
@@ -108,17 +114,17 @@
                         btwnField.show();
                     } else {
                         btwnField.hide();
-                        if (type === "true" || type === "false" || type === "null" || type === "nnull") {
+                        if (type === "true" || type === "false" || type === "null" || type === "nnull" || type === "else") {
                             valueField.hide();
                         } else {
                             valueField.show();
                         }
                     }
                 });
-                
+
                 var deleteButton = $('<a/>',{href:"#",class:"btn btn-mini", style:"margin-left: 5px;"}).appendTo(finalspan);
                 $('<i/>',{class:"icon-remove"}).appendTo(deleteButton);
-                
+
                 deleteButton.click(function() {
                     container.css({"background":"#fee"});
                     container.fadeOut(300, function() {
@@ -126,12 +132,12 @@
                         $("#node-input-rule-container").children().each(function(i) {
                             $(this).find(".node-input-rule-index").html(i+1);
                         });
-                    
+
                     });
                 });
-                
+
                 $("#node-input-rule-container").append(container);
-                
+
                 selectField.find("option").filter(function() {return $(this).val() == rule.t;}).attr('selected',true);
                 if (rule.t == "btwn") {
                     btwnValueField.val(rule.v);
@@ -140,20 +146,18 @@
                     valueField.val(rule.v);
                 }
                 selectField.change();
-                
             }
-            
+
             $("#node-input-add-rule").click(function() {
                 generateRule($("#node-input-rule-container").children().length+1,{t:"",v:"",v2:""});
                 $("#node-input-rule-container-div").scrollTop($("#node-input-rule-container-div").get(0).scrollHeight);
-                
             });
-            
+
             for (var i=0;i<this.rules.length;i++) {
                 var rule = this.rules[i];
                 generateRule(i+1,rule);
             }
-            
+
             function switchDialogResize(ev,ui) {
                 $("#node-input-rule-container-div").css("height",(ui.size.height-260)+"px");
             };
@@ -172,15 +176,13 @@
         oneditsave: function() {
             var rules = $("#node-input-rule-container").children();
             var ruleset;
-            
             var node = this;
             node.rules= [];
-            
             rules.each(function(i) {
                 var rule = $(this);
                 var type = rule.find("select option:selected").val();
                 var r = {t:type};
-                if (!(type === "true" || type === "false" || type === "null" || type === "nnull")) {
+                if (!(type === "true" || type === "false" || type === "null" || type === "nnull" || type === "else")) {
                     if (type === "btwn") {
                         r.v = rule.find(".node-input-rule-btwn-value").val();
                         r.v2 = rule.find(".node-input-rule-btwn-value2").val();
@@ -189,11 +191,8 @@
                     }
                 }
                 node.rules.push(r);
-                
             });
-            
             node.outputs = node.rules.length;
-        
         }
     });
 </script>
diff --git a/nodes/core/logic/10-switch.js b/nodes/core/logic/10-switch.js
index 5d312518f..c4c8d23b6 100644
--- a/nodes/core/logic/10-switch.js
+++ b/nodes/core/logic/10-switch.js
@@ -14,51 +14,52 @@
  * limitations under the License.
  **/
 
-var RED = require(process.env.NODE_RED_HOME+"/red/red");
+var RED = require(process.env.NODE_RED_HOME + "/red/red");
 
 var operators = {
-    'eq':function(a,b) { return a == b; },
-    'neq':function(a,b) { return a != b; },
-    'lt':function(a,b) { return a < b; },
-    'lte':function(a,b) { return a <= b; },
-    'gt':function(a,b) { return a > b; },
-    'gte':function(a,b) { return a >= b; },
-    'btwn':function(a,b,c) { return a >= b && a <= c; },
-    'cont':function(a,b) { return (a+"").indexOf(b) != -1; },
-    'regex': function(a,b) { return (a+"").match(new RegExp(b)); },
+    'eq': function(a, b) { return a == b; },
+    'neq': function(a, b) { return a != b; },
+    'lt': function(a, b) { return a < b; },
+    'lte': function(a, b) { return a <= b; },
+    'gt': function(a, b) { return a > b; },
+    'gte': function(a, b) { return a >= b; },
+    'btwn': function(a, b, c) { return a >= b && a <= c; },
+    'cont': function(a, b) { return (a + "").indexOf(b) != -1; },
+    'regex': function(a, b) { return (a + "").match(new RegExp(b)); },
     'true': function(a) { return a === true; },
     'false': function(a) { return a === false; },
     'null': function(a) { return a === null; },
-    'nnull': function(a) { return a !== null; }
+    'nnull': function(a) { return a !== null; },
+    'else': function(a) { return a === true; }
 };
 
-
 function SwitchNode(n) {
-	RED.nodes.createNode(this,n);
-	
-	this.rules = n.rules;
-	this.property = n.property;
-	
-	var propertyParts = n.property.split(".");
-	
-	var node = this;
-	
-	this.on('input',function(msg) {
-	      var onward = [];
-	      var prop = propertyParts.reduce(function(obj,i) {
-	          return obj[i]
-	      },msg);
-	      for (var i=0;i<node.rules.length;i+=1) {
-	          var rule = node.rules[i];
-	          if (operators[rule.t](prop,rule.v,rule.v2)) {
-	              onward.push(msg);
-	          } else {
-	              onward.push(null);
-	          }
-	      }
-	      this.send(onward);
-	});
+    RED.nodes.createNode(this, n);
+    this.rules = n.rules;
+    this.property = n.property;
+    this.checkall = n.checkall || "true";
+    var propertyParts = n.property.split("."),
+        node = this;
+
+    this.on('input', function (msg) {
+        var onward = [];
+        var prop = propertyParts.reduce(function (obj, i) {
+            return obj[i]
+        }, msg);
+        var elseflag = true;
+        for (var i=0; i<node.rules.length; i+=1) {
+            var rule = node.rules[i];
+            var test = prop;
+            if (rule.t == "else") { test = elseflag; elseflag = true; }
+            if (operators[rule.t](test,rule.v, rule.v2)) {
+                onward.push(msg);
+                elseflag = false;
+                if (node.checkall == "false") { break; }
+            } else {
+                onward.push(null);
+            }
+        }
+        this.send(onward);
+    });
 }
-
-RED.nodes.registerType("switch",SwitchNode);
-
+RED.nodes.registerType("switch", SwitchNode);