diff --git a/src/locales/en-US/opcua-iiot-flex-server.json b/src/locales/en-US/opcua-iiot-flex-server.json
index 75b9a9aa..ea7da8a3 100644
--- a/src/locales/en-US/opcua-iiot-flex-server.json
+++ b/src/locales/en-US/opcua-iiot-flex-server.json
@@ -31,7 +31,8 @@
       "users": "Users & Sets",
       "settings": "Settings",
       "security": "Security",
-      "ass": "Address Space"
+      "ass": "Address Space",
+      "discovery": "Discovery"
     }
   }
 }
diff --git a/src/locales/en-US/opcua-iiot-read.json b/src/locales/en-US/opcua-iiot-read.json
index ba4bb5ad..152237a1 100644
--- a/src/locales/en-US/opcua-iiot-read.json
+++ b/src/locales/en-US/opcua-iiot-read.json
@@ -8,7 +8,8 @@
       "maxAge": "Max. Age",
       "depth": "Depth",
       "justValue": "Send Just Values",
-      "parseStrings": "Parse Result"
+      "parseStrings": "Parse Result",
+      "historyDays": "History Days"
     }
   }
 }
diff --git a/src/locales/en-US/opcua-iiot-server.json b/src/locales/en-US/opcua-iiot-server.json
index e37ea481..65bc841c 100644
--- a/src/locales/en-US/opcua-iiot-server.json
+++ b/src/locales/en-US/opcua-iiot-server.json
@@ -24,12 +24,16 @@
       "asoDemo": "ASO Demo",
       "serverDiscovery": "Discovery",
       "maxNodesPerRead": "Max per Read",
-      "maxNodesPerBrowse": "Max per Browse"
+      "maxNodesPerBrowse": "Max per Browse",
+      "registerServerMethod": "Register Server Method",
+      "discoveryServerEndpointUrl": "Endpoint Url",
+      "capabilitiesForMDNS": "MDNS capabilities"
     },
     "tabs-label": {
       "users": "Users & Sets",
       "settings": "Settings",
-      "security": "Security"
+      "security": "Security",
+      "discovery": "Discovery"
     }
   }
 }
diff --git a/src/opcua-iiot-discovery.html b/src/opcua-iiot-discovery.html
index 0d36cdf2..563dbd27 100644
--- a/src/opcua-iiot-discovery.html
+++ b/src/opcua-iiot-discovery.html
@@ -13,6 +13,7 @@
     color: "#ABCDEF",
     defaults: {
       name: {value: ""},
+      discoveryPort: {value: ''}
     },
     inputs: 1,
     outputs: 1,
@@ -32,6 +33,10 @@
         <label for="node-input-name"><i class="icon-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
         <input type="text" id="node-input-name" placeholder="">
     </div>
+    <div class="form-row">
+        <label for="node-input-discoveryPort"><i class="icon-tag"></i> <span data-i18n="node-red:common.label.discoveryPort"></span></label>
+        <input type="text" id="node-input-discoveryPort" placeholder="4840">
+    </div>
 </script>
 
 <script type="text/x-red" data-help-name="OPCUA-IIoT-Discovery">
diff --git a/src/opcua-iiot-discovery.js b/src/opcua-iiot-discovery.js
index ce284b4a..967aeb39 100644
--- a/src/opcua-iiot-discovery.js
+++ b/src/opcua-iiot-discovery.js
@@ -20,9 +20,10 @@ module.exports = function (RED) {
   function OPCUAIIoTDiscovery (config) {
     RED.nodes.createNode(this, config)
     this.name = config.name
+    this.discoveryPort = config.discoveryPort || 4840
 
-    let discoveryServer = new coreDiscovery.core.nodeOPCUA.OPCUADiscoveryServer({})
     let node = this
+    let discoveryServer = new coreDiscovery.core.nodeOPCUA.OPCUADiscoveryServer({port: node.discoveryPort})
 
     node.status({fill: 'blue', shape: 'ring', text: 'new'})
 
@@ -47,8 +48,11 @@ module.exports = function (RED) {
       if (discoveryServer !== null) {
         discoveryServer.shutdown(function () {
           coreDiscovery.internalDebugLog('shutdown')
+          done()
         })
         discoveryServer = null
+      } else {
+        done()
       }
     })
   }
diff --git a/src/opcua-iiot-flex-server.js b/src/opcua-iiot-flex-server.js
index ce35db5e..291263bc 100644
--- a/src/opcua-iiot-flex-server.js
+++ b/src/opcua-iiot-flex-server.js
@@ -136,13 +136,12 @@ module.exports = function (RED) {
 
       let serverOptions = {
         port: node.port,
-        // registerServerMethod: coreServer.core.nodeOPCUA.RegisterServerMethod.LDS, // TODO: Hidden, MDNS or LDS
         nodeset_filename: xmlFiles,
         resourcePath: node.endpoint || 'UA/NodeREDFlexIIoTServer',
         buildInfo: {
           productName: node.name || 'Node-RED Flex IIoT Server',
           buildNumber: '24122017',
-          buildDate: new Date(2017, 12, 24)
+          buildDate: new Date(2018, 12, 24)
         },
         serverCapabilities: {
           operationLimits: {
diff --git a/src/opcua-iiot-read.html b/src/opcua-iiot-read.html
index 4726d9f5..64f9b733 100644
--- a/src/opcua-iiot-read.html
+++ b/src/opcua-iiot-read.html
@@ -20,7 +20,8 @@
       justValue: {value: true},
       showStatusActivities: {value: false},
       showErrors: {value: false},
-      parseStrings: {value: false}
+      parseStrings: {value: false},
+      historyDays: {value: 1}
     },
     inputs: 1,
     outputs: 1,
@@ -35,6 +36,7 @@
     oneditprepare: function () {
       try {
         let depthRow = $("#node-input-depth-row")
+        let historyRow = $("#node-input-history-row")
 
         if (parseInt(this.attributeId) === 99) {
           depthRow.show();
@@ -50,6 +52,12 @@
           } else {
             depthRow.hide()
           }
+
+          if ($(this).val() === "130") {
+            historyRow.show()
+          } else {
+            historyRow.hide()
+          }
         })
       } catch
         (err) {
@@ -78,6 +86,12 @@
             <option value="130">History</option>
         </select>
     </div>
+    <div id="node-input-history-row">
+       <div class="form-row">
+          <label for="node-input-historyDays"><i class="icon-calendar"></i> <span data-i18n="opcua-iiot-contrib.label.historyDays"></span></label>
+          <input type="text" id="node-input-historyDays" placeholder="1">
+       </div>
+    </div>
     <div class="form-row">
         <label for="node-input-maxAge"><i class="icon-random"></i> <span data-i18n="opcua-iiot-contrib.label.maxAge"></span></label>
         <input type="text" id="node-input-maxAge" placeholder="1">
diff --git a/src/opcua-iiot-read.js b/src/opcua-iiot-read.js
index bb0d0f31..3cce2512 100644
--- a/src/opcua-iiot-read.js
+++ b/src/opcua-iiot-read.js
@@ -19,14 +19,16 @@ module.exports = function (RED) {
 
   function OPCUAIIoTRead (config) {
     RED.nodes.createNode(this, config)
-    this.attributeId = config.attributeId || 0
-    this.maxAge = config.maxAge || 1
-    this.depth = config.depth || 1
+    this.attributeId = parseInt(config.attributeId) || 0
+    this.maxAge = parseInt(config.maxAge) || 1
+    this.depth = parseInt(config.depth) || 1
     this.name = config.name
     this.justValue = config.justValue
     this.showStatusActivities = config.showStatusActivities
     this.showErrors = config.showErrors
     this.parseStrings = config.parseStrings
+    this.historyDays = parseInt(config.historyDays) || 1
+
     this.connector = RED.nodes.getNode(config.connector)
 
     let node = this
@@ -86,22 +88,26 @@ module.exports = function (RED) {
           })
           break
         case 130:
-          let historyDate = new Date()
-          node.historyStart = new Date(historyDate.getDate() - 1)
-          node.historyEnd = historyDate
-
-          coreClient.readHistoryValue(session, itemsToRead, node.historyStart, node.historyEnd).then(function (readResult) {
-            try {
-              let message = node.buildResultMessage(msg, 'HistoryValue', readResult)
-              message.historyStart = node.historyStart
-              message.historyEnd = node.historyEnd
-              node.send(message)
-            } catch (err) {
+          let startDate = new Date()
+          node.historyStart = new Date()
+          node.historyStart.setDate(startDate - node.historyDays)
+          node.historyEnd = new Date()
+
+          coreClient.readHistoryValue(session, itemsToRead,
+            msg.payload.historyStart || node.historyStart,
+            msg.payload.historyEnd || node.historyEnd)
+            .then(function (readResult) {
+              try {
+                let message = node.buildResultMessage(msg, 'HistoryValue', readResult)
+                message.historyStart = node.historyStart
+                message.historyEnd = node.historyEnd
+                node.send(message)
+              } catch (err) {
+                node.handleReadError(err, msg)
+              }
+            }).catch(function (err) {
               node.handleReadError(err, msg)
-            }
-          }).catch(function (err) {
-            node.handleReadError(err, msg)
-          })
+            })
           break
         default:
           let item = null
diff --git a/src/opcua-iiot-server.html b/src/opcua-iiot-server.html
index a942777b..cc433786 100644
--- a/src/opcua-iiot-server.html
+++ b/src/opcua-iiot-server.html
@@ -30,6 +30,9 @@
       xmlsets: { value: [] },
       publicCertificateFile: {value: ''},
       privateCertificateFile: {value: ''},
+      registerServerMethod: {value: 1},
+      discoveryServerEndpointUrl: {value: ''},
+      capabilitiesForMDNS: {value: ''},
       maxNodesPerRead: {value: 1000, validate:function(v) { return ((v === '') || (RED.validators.number(v) && (v > 0) && (v <= 100000))) }},
       maxNodesPerBrowse: {value: 2000, validate:function(v) { return ((v === '') || (RED.validators.number(v) && (v > 0) && (v <= 200000))) }}
     },
@@ -72,6 +75,11 @@
         label: this._("opcua-iiot-contrib.tabs-label.users")
       })
 
+      tabs.addTab({
+        id: "opcuaiiot-server-tab-discovery",
+        label: this._("opcua-iiot-contrib.tabs-label.discovery")
+      })
+
       // User Management
       if(node.users && node.users.length > 0) {
         cacheItemCount = node.users.length
@@ -394,6 +402,42 @@
                 <input type="checkbox" id="node-input-showErrors" style="max-width:30px">
             </div>
         </div>
+        <div id="opcuaiiot-server-tab-discovery" style="display:none">
+            <div class="form-row">
+                <!-- SecurityPolicy enum via REST -->
+                <label for="node-input-registerServerMethod" style="min-width:160px"><i class="fa fa-discover"></i>
+                <span data-i18n="opcua-iiot-contrib.label.registerServerMethod"></span></label>
+                <select type="text" id="node-input-registerServerMethod">
+                    <option value="1">HIDDEN</option>
+                    <option value="2">MDNS</option>
+                    <option value="3">LDS</option>
+                </select>
+            </div>
+            <div class="form-row">
+                <span style="min-width:160px">
+                  <ul>
+                    <li>HIDDEN: the server doesn't expose itself to the external world
+                    <li>MDNS: the server publish itself to the mDNS Multicast network directly
+                    <li>LDS: the server registers itself to the LDS or LDS-ME (Local Discovery Server)
+                  </ul>
+                </span>
+            </div>
+            <div class="form-row">
+                 <label for="node-input-serverDiscovery" style="min-width:160px"><i class="fa fa-cc-discover"></i>
+                 <span data-i18n="opcua-iiot-contrib.label.serverDiscovery"></span></label>
+                <input type="checkbox" id="node-input-serverDiscovery" style="max-width:35px">
+            </div>
+            <div class="form-row">
+                <label for="node-input-discoveryServerEndpointUrl" style="min-width:160px"><i class="icon-discover"></i>
+                <span data-i18n="opcua-iiot-contrib.label.discoveryServerEndpointUrl"></span></label>
+                <input type="text" id="node-input-discoveryServerEndpointUrl" placeholder="opc.tcp://localhost:4840">
+            </div>
+            <div class="form-row">
+                <label for="node-input-capabilitiesForMDNS" style="min-width:160px"><i class="icon-discover"></i>
+                <span data-i18n="opcua-iiot-contrib.label.capabilitiesForMDNS"></span></label>
+                <input type="text" id="node-input-capabilitiesForMDNS" placeholder="NA,DA,..." >
+            </div>
+        </div>
         <div id="opcuaiiot-server-tab-security" style="display:none">
             <div class="form-row">
                 <!-- SecurityPolicy enum via REST -->
@@ -441,11 +485,6 @@
                  <span data-i18n="opcua-iiot-contrib.label.allowAnonymous"></span></label>
                 <input type="checkbox" id="node-input-allowAnonymous" style="max-width:35px">
             </div>
-            <div class="form-row">
-                 <label for="node-input-serverDiscovery" style="min-width:140px"><i class="fa fa-cc-discover"></i>
-                 <span data-i18n="opcua-iiot-contrib.label.serverDiscovery"></span></label>
-                <input type="checkbox" id="node-input-serverDiscovery" style="max-width:35px">
-            </div>
         </div>
         <div id="opcuaiiot-server-tab-users" style="display:none">
             <h4><span data-i18n="opcua-iiot-contrib.label.users"></span></h4>
diff --git a/src/opcua-iiot-server.js b/src/opcua-iiot-server.js
index a1bfe3cd..ac87198a 100644
--- a/src/opcua-iiot-server.js
+++ b/src/opcua-iiot-server.js
@@ -46,6 +46,9 @@ module.exports = function (RED) {
     this.asoDemo = config.asoDemo
     // discovery
     this.disableDiscovery = !config.serverDiscovery
+    this.registerServerMethod = config.registerServerMethod || 1
+    this.discoveryServerEndpointUrl = config.discoveryServerEndpointUrl
+    this.capabilitiesForMDNS = (config.capabilitiesForMDNS) ? config.capabilitiesForMDNS.split(',') : [config.capabilitiesForMDNS]
     // limits
     this.maxNodesPerRead = config.maxNodesPerRead || 1000
     this.maxNodesPerBrowse = config.maxNodesPerBrowse || 2000
@@ -122,15 +125,25 @@ module.exports = function (RED) {
 
       coreServer.name = 'NodeREDIIoTServer'
 
+      switch (parseInt(node.registerServerMethod)) {
+        case 2:
+          node.registerServerMethod = coreServer.core.nodeOPCUA.RegisterServerMethod.MDNS
+          break
+        case 3:
+          node.registerServerMethod = coreServer.core.nodeOPCUA.RegisterServerMethod.LDS
+          break
+        default:
+          node.registerServerMethod = coreServer.core.nodeOPCUA.RegisterServerMethod.HIDDEN
+      }
+
       let serverOptions = {
         port: node.port,
-        // registerServerMethod: coreServer.core.nodeOPCUA.RegisterServerMethod.LDS, // TODO: Hidden, MDNS or LDS
         nodeset_filename: xmlFiles,
         resourcePath: node.endpoint || 'UA/NodeREDIIoTServer',
         buildInfo: {
           productName: node.name || 'NodeOPCUA IIoT Server',
           buildNumber: '160417',
-          buildDate: new Date(2017, 4, 16)
+          buildDate: new Date(2018, 4, 16)
         },
         serverCapabilities: {
           operationLimits: {
@@ -160,6 +173,18 @@ module.exports = function (RED) {
         disableDiscovery: node.disableDiscovery
       }
 
+      if (!node.disableDiscovery) {
+        serverOptions.registerServerMethod = node.registerServerMethod
+
+        if (node.discoveryServerEndpointUrl && node.discoveryServerEndpointUrl !== '') {
+          serverOptions.discoveryServerEndpointUrl = node.discoveryServerEndpointUrl
+        }
+
+        if (node.capabilitiesForMDNS && node.capabilitiesForMDNS.length) {
+          serverOptions.capabilitiesForMDNS = node.capabilitiesForMDNS
+        }
+      }
+
       coreServer.detailDebugLog('serverOptions:' + JSON.stringify(serverOptions))
       node.opcuaServer = new coreServer.core.nodeOPCUA.OPCUAServer(serverOptions)
       node.opcuaServer.initialize(node.postInitialize)