diff --git a/hardware/scanBLE/101-scanBLE.html b/hardware/scanBLE/101-scanBLE.html
index cd602574..329d142c 100644
--- a/hardware/scanBLE/101-scanBLE.html
+++ b/hardware/scanBLE/101-scanBLE.html
@@ -1,12 +1,12 @@
 <!--
   Copyright 2013 Charalampos Doukas.
- 
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
- 
+
   http://www.apache.org/licenses/LICENSE-2.0
- 
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,18 +26,18 @@
      <label for="node-input-topic"><i class="icon-tasks"></i> UUID</label>
     <input type="text" id="node-input-ble_uuid" placeholder="UUID">
   </div>
- 
+
   <div class="form-row">
     <label for="node-input-name"><i class="icon-tag"></i> Name</label>
     <input type="text" id="node-input-name" placeholder="Name">
   </div>
 </script>
- 
+
 <!-- Next, some simple help text is provided for the node.                   -->
 <script type="text/x-red" data-help-name="scanBLE">
     <p>Scans for a specific BLE Device</p>
 </script>
- 
+
 <!-- Finally, the node type is registered along with all of its properties   -->
 <script type="text/javascript">
     RED.nodes.registerType('scanBLE',{
@@ -50,7 +50,7 @@
         },
         inputs:1,                // set the number of inputs - only 0 or 1
         outputs:1,               // set the number of outputs - 0 to n
-        icon: "arrow-in.png",    // set the icon (held in public/icons)
+        icon: "bluetooth.png",    // set the icon (held in public/icons)
         label: function() {      // sets the default label contents
             return this.name||this.topic||"scanBLE";
         },
diff --git a/hardware/scanBLE/101-scanBLE.js b/hardware/scanBLE/101-scanBLE.js
index 328077f7..04a308b5 100644
--- a/hardware/scanBLE/101-scanBLE.js
+++ b/hardware/scanBLE/101-scanBLE.js
@@ -18,7 +18,6 @@
  * limitations under the License.
  **/
 
-
 //might need to modify accordingly
 var RED = require("../../red/red");
 
@@ -26,9 +25,9 @@ var RED = require("../../red/red");
 var noble = require('noble');
 
 // The main node definition - most things happen in here
-function Scan(n) {      
-    // Create a RED node
-    RED.nodes.createNode(this,n);
+function BleScan(n) {
+	// Create a RED node
+	RED.nodes.createNode(this,n);
 
     var msg = {};
     var ble_name; 
@@ -62,15 +61,12 @@ function Scan(n) {
 		node.send(msg);
 });
 
-
+	this.on("close", function() {
+		try { noble.stopScanning(); }
+		catch (err) { console.log(err); }
+	});
 }
 
 // Register the node by name. This must be called before overriding any of the
 // Node functions.
-RED.nodes.registerType("scanBLE", Scan);
-
-
-Scan.prototype.close = function() {
-
-}
-
+RED.nodes.registerType("scanBLE", BleScan);