diff --git a/APPSTORE.md b/APPSTORE.md
index f4ffa93..c9976a3 100644
--- a/APPSTORE.md
+++ b/APPSTORE.md
@@ -42,8 +42,9 @@ For Homey to be able to communicate with devices over the miIO protocol a unique
 * [ACTIONS] Power on/off, Set speed
 
 ## Changelog
-### 2017-11-11 -- v2.3.2
+### 2017-11-30 -- v2.3.2
 * FIX: added a keep-alive to Yeelight connections to maintain the connection over time
+* FIX: fixed pairing wizard for Humidifier and Purifier
 
 ### 2017-11-06 -- v2.3.1
 * UPDATE: code rewrite for SDK2
diff --git a/app.json b/app.json
index 45dcb63..4406a95 100644
--- a/app.json
+++ b/app.json
@@ -18,11 +18,13 @@
     "contributing": {
         "donate": {
             "paypal": {
-                "email": "paypal@solidewebservices.com",
-                "currency": "EUR"
+                "username": "jghaanstra"
             }
         }
     },
+    "bugs": {
+        "url": "https://github.com/jghaanstra/com.xiaomi-miio/issues"
+    },
     "images": {
         "large": "./assets/images/large.jpg",
         "small": "./assets/images/small.jpg"
diff --git a/drivers/mi-airpurifier/pair/start.html b/drivers/mi-airpurifier/pair/start.html
index 009df7f..18b3308 100644
--- a/drivers/mi-airpurifier/pair/start.html
+++ b/drivers/mi-airpurifier/pair/start.html
@@ -17,7 +17,7 @@
                 token: inputtoken
             };
 
-            Homey.emit('test-connection', device_data, function(error, result) {
+            Homey.emit('testConnection', device_data, function(error, result) {
                 if(error) {
                     $('.mi-device-error').show();
                     $('.mi-device-error-msg').html(error.message || error.toString());
diff --git a/drivers/mi-humidifier/pair/start.html b/drivers/mi-humidifier/pair/start.html
index f557a14..d9c20b3 100644
--- a/drivers/mi-humidifier/pair/start.html
+++ b/drivers/mi-humidifier/pair/start.html
@@ -17,7 +17,7 @@
                 token: inputtoken
             };
 
-            Homey.emit('test-connection', device_data, function(error, result) {
+            Homey.emit('testConnection', device_data, function(error, result) {
                 if(error) {
                     $('.mi-device-error').show();
                     $('.mi-device-error-msg').html( error.message || error.toString() );
diff --git a/drivers/mi-robot/pair/start.html b/drivers/mi-robot/pair/start.html
deleted file mode 100644
index 15121e4..0000000
--- a/drivers/mi-robot/pair/start.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<script type="text/javascript">
-
-Homey.setTitle( __('pair.title') );
-
-$(function() {
-    $('#test-connection').click(function() {
-        $('.mi-device-test').hide();
-        $('.mi-device-error').hide();
-        $('.mi-device-ok').hide();
-
-		var inputaddress = $('#address').val();
-		var inputtoken = $('#token').val();
-
-        if( inputaddress != '' && inputtoken != '') {
-            var device_data = {
-                address: inputaddress,
-                token: inputtoken
-            };
-
-            Homey.emit('test-connection', device_data, function(error, result) {
-                if(error) {
-                    $('.mi-device-error').show();
-                    $('.mi-device-error-msg').html(error.message || error.toString());
-                } else {
-                    $('.mi-device-test').show();
-                    $('#connect').prop('disabled', false);
-                }
-            });
-
-        } else {
-            $('.mi-device-error').show();
-            $('.mi-device-error-msg').html( __('pair.nosettings') );
-        }
-
-	});
-
-	$('#connect').click(function(){
-		var inputaddress = $('#address').val();
-		var inputtoken = $('#token').val();
-        var inputpolling = $('#polling').val() || 60;
-
-        if( inputaddress != '' && inputtoken != '' && inputpolling != '') {
-            var device_data = {
-                id: inputtoken
-            };
-            var settings = {
-                address: inputaddress,
-                token: inputtoken
-            };
-            var state = {
-                onoff: false,
-                state: 'charging',
-                battery: 100
-            };
-
-            Homey.addDevice({
-                name	 : 'Mi Robot',
-                data 	 : device_data,
-                settings : settings,
-                state    : state
-            }, function(error, result) {
-                if (error) {
-                    $('.mi-device-test').hide();
-                    $('.mi-device-error').show();
-                    $('.mi-device-error-msg').html(error.message || error.toString());
-                }
-                $('.mi-device-test').hide();
-                $('.mi-device-ok').show();
-
-                return Homey.done();
-            })
-
-        } else {
-            $('.mi-device-test').hide();
-            $('.mi-device-error').show();
-            $('.mi-device-error-msg').html( __('pair.nosettings') );
-        }
-
-	});
-})
-</script>
-
-<style type="text/css">
-	.mi-device-status {
-		display: none;
-	}
-    .form-group input[type="text"] {
-        width: 80% !important;
-    }
-    .buttons, .messages {
-        padding-top: 14px;
-    }
-</style>
-
-<p data-i18n="pair.intro">Enter the details of your Mi Home device.</p>
-
-<div class="form-group">
-    <label for="address" data-i18n="pair.address">IP address</label>
-    <input type="text" class="form-control" id="address" placeholder="192.168.0.100">
-</div>
-<div class="form-group">
-	<label for="token" data-i18n="pair.token">Token (32 characters of numbers and letters)</label>
-	<input type="text" class="form-control" id="token" pattern="[a-zA-Z0-9]{32}" placeholder="FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF">
-</div>
-<div class="form-group">
-    <label for="polling" data-i18n="pair.polling">Polling Frequency</label>
-    <input type="number" class="form-control" id="polling" min="10" max="3600" placeholder="60">
-</div>
-<div class="form-group buttons">
-    <button id="test-connection" class="button" data-i18n="pair.test">Test Connection</button>
-    <button id="connect" class="button" data-i18n="pair.connect" disabled>Connect</button>
-</div>
-
-<div class="messages">
-    <p class="mi-device-status mi-device-test" style="color: #008C23;"><i class="fa fa-check"></i> <span data-i18n="pair.testingVacuum">Mi Robot find message send succesfully, did you hear the robot?</span></p>
-    <p class="mi-device-status mi-device-ok" style="color: #008C23;"><i class="fa fa-check"></i> <span data-i18n="pair.success">Mi Home device added succesfully.</span></p>
-    <p class="mi-device-status mi-device-error" style="color: #ff6300;"><i class="fa fa-times"></i> <span class="mi-device-error-msg"></span></p>
-</div>
diff --git a/drivers/yeelights/device.js b/drivers/yeelights/device.js
index 83f15cf..68fdea7 100644
--- a/drivers/yeelights/device.js
+++ b/drivers/yeelights/device.js
@@ -96,7 +96,7 @@ class YeelightDevice extends Homey.Device {
             if (yeelights[id].socket === null) {
         		yeelights[id].socket = new net.Socket();
                 yeelights[id].socket.connect(yeelights[id].data.port, yeelights[id].data.address);
-                socket.setKeepAlive(true, 60000);
+                yeelights[id].socket.setKeepAlive(true, 60000);
             }
         } catch (error) {
     		console.log("Yeelight: error creating socket " + error);
diff --git a/lib/util.js b/lib/util.js
index 36bac26..d629bb8 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -140,19 +140,10 @@ exports.sendCommand = function (command, value, address, token) {
                 default:
                     this.log("Not a valid command");
                     return reject("Not a valid command");
+
             }
         }).catch(function (error) {
             return reject(error);
         })
     })
 }
-
-exports.normalize = function (value, min, max) {
-	var normalized = (value - min) / (max - min);
-	return normalized;
-}
-
-exports.denormalize = function (normalized, min, max) {
-	var denormalized = ((1 - normalized) * (max - min) + min);
-	return denormalized;
-}
diff --git a/package.json b/package.json
index de5d6fa..b9e439e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.xiaomi-miio",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "Xiaomi Mi Home",
   "main": "app.js",
   "dependencies": {