diff --git a/hardware/intel/mraa-gpio-din.html b/hardware/intel/mraa-gpio-din.html
index fdbcfc45..88e256bd 100644
--- a/hardware/intel/mraa-gpio-din.html
+++ b/hardware/intel/mraa-gpio-din.html
@@ -1,13 +1,15 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('mraa-gpio-din',{
-        category: 'Intel gpio',
+        category: 'GPIO',
         color: '#a6bbcf',
         paletteLabel: 'digital',
         defaults: {
             name: {value:""},
             pin:  {value:"", required: true},
-            interrupt: {value:"", required: true}
+            interrupt: {value:"", required: true},
+            mode: {value:"", required: true},
+            initial: {value: false}
         },
         inputs:0,
         outputs:1,
@@ -30,6 +32,7 @@
                 if (data === 5) { t = "Raspberry Pi"; }
                 if (data === 6) { t = "Beaglebone"; }
                 if (data === 7) { t = "Banana"; }
+                if (data === 25) { t = "IOT2050"; }
                 $('#type-tip').text(t);
                 $('#node-input-pin').val(pinnow);
             });
@@ -59,6 +62,22 @@
             <option value="11">D11</option>
             <option value="12">D12</option>
             <option value="13">D13</option>
+            <option value="14">D14</option>
+            <option value="15">D15</option>
+            <option value="16">D16</option>
+            <option value="17">D17</option>
+            <option value="18">D18</option>
+            <option value="19">D19</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa-level-up"></i> Mode</label>
+        <select type="text" id="node-input-mode" style="width: 250px;">
+            <option value='' disabled selected style='display:none;'>select mode</option>
+            <option value="0">Strong </option>
+            <option value="1">Pull-up </option>
+            <option value="2">Pull-down </option>
+            <option value="3">Hiz </option>
         </select>
     </div>
     <div class="form-row">
@@ -70,6 +89,11 @@
             <option value="b">Both </option>
         </select>
     </div>
+    <div class="form-row" id="node-initial-tick">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-initial" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-initial" style="width: 70%;">Send initial message with level of pin.</label>
+    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name" style="width: 250px;">
@@ -78,7 +102,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="mraa-gpio-din">
-    <p>A digital input pin for an Intel Galileo or Edison board.</p>
+    <p>A digital input pin for an Intel Galileo/Edison/Siemens IOT2050 board.</p>
     <p>The <code>msg.payload</code> contains the value (0 or 1), and <code>msg.topic</code>
     contains "{the_board_name}/D{the pin number}".</p>
 </script>
diff --git a/hardware/intel/mraa-gpio-din.js b/hardware/intel/mraa-gpio-din.js
index 5966e448..cfb79612 100644
--- a/hardware/intel/mraa-gpio-din.js
+++ b/hardware/intel/mraa-gpio-din.js
@@ -7,13 +7,16 @@ module.exports = function(RED) {
         RED.nodes.createNode(this,n);
         this.pin = n.pin;
         this.interrupt = n.interrupt;
+        this.mode = n.mode;
+        this.initialMsg = n.initial;
         this.x = new m.Gpio(parseInt(this.pin));
         this.board = m.getPlatformName();
+        this.defaultTimeout = 100;
         var node = this;
-        node.x.mode(m.PIN_GPIO);
+        node.x.mode(parseInt(this.mode));
         node.x.dir(m.DIR_IN);
-        node.x.isr(m.EDGE_BOTH, function() {
-            var g = node.x.read();
+
+        var eventHandler = function(g) {
             var msg = { payload:g, topic:node.board+"/D"+node.pin };
             switch (g) {
                 case 0: {
@@ -34,8 +37,15 @@ module.exports = function(RED) {
                     node.status({fill:"grey",shape:"ring",text:"unknown"});
                 }
             }
-        });
-        switch (node.x.read()) {
+        }
+
+        var isrCallback = function() {
+            eventHandler(node.x.read());
+        }
+
+        node.x.isr(m.EDGE_BOTH, isrCallback);
+        var initialState = node.x.read();
+        switch (initialState) {
             case 0: {
                 node.status({fill:"green",shape:"ring",text:"low"});
                 break;
@@ -48,8 +58,17 @@ module.exports = function(RED) {
                 node.status({});
             }
         }
+
+        if (this.initialMsg) {
+            setTimeout(() => {
+                node.send( { payload: node.x.read(), topic:node.board+"/D"+node.pin } );
+            }, this.defaultTimeout);
+        }
+
         this.on('close', function() {
             node.x.isr(m.EDGE_BOTH, null);
+            node.x.isrExit();
+            node.x.close();
         });
     }
     RED.nodes.registerType("mraa-gpio-din", gpioDin);