diff --git a/app.json b/app.json
index 9f8b4de..fdbe2d4 100644
--- a/app.json
+++ b/app.json
@@ -1,537 +1,532 @@
 {
-  "id": "com.devolo",
-  "name": {
-    "en": "Devolo"
-  },
-  "version": "1.0.1",
-  "compatibility": ">=0.9.3",
-  "description": {
-    "en": "Devolo z-wave devices for Homey"
-  },
-  "category": [
-    "appliances",
-    "lights"
-  ],
-  "images": {
-    "large": "/assets/images/large.png",
-    "small": "/assets/images/small.png"
-  },
-  "author": {
-    "name": "Bram Oosterhuis",
-    "email": "bram.oosterhuis.nl@gmail.com"
-  },
-  "contributors": {
-    "developers": []
-  },
-  "flow": {
-    "triggers": [{
-      "id": "mt2652_btn1_single",
-      "title": {
-        "en": "Button 1 single press",
-        "nl": "Een maal gedrukt op knop 1"
-      },
-      "args": [{
-        "name": "device",
-        "type": "device",
-        "filter": "driver_id=MT2652"
-      }]
-    }, {
-      "id": "mt2652_btn1_double",
-      "title": {
-        "en": "Button 1 double press",
-        "nl": "Twee maal gedrukt op knop 1"
-      },
-      "args": [{
-        "name": "device",
-        "type": "device",
-        "filter": "driver_id=MT2652"
-      }]
-    },  {
-      "id": "mt2652_btn2_single",
-      "title": {
-        "en": "Button 2 single press",
-        "nl": "Een maal gedrukt op knop 2"
-      },
-      "args": [{
-        "name": "device",
-        "type": "device",
-        "filter": "driver_id=MT2652"
-      }]
-    }, {
-      "id": "mt2652_btn2_double",
-      "title": {
-        "en": "Button 2 double press",
-        "nl": "Twee maal gedrukt op knop 2"
-      },
-      "args": [{
-        "name": "device",
-        "type": "device",
-        "filter": "driver_id=MT2652"
-      }]
-    }, {
-      "id": "mt2652_btn3_single",
-      "title": {
-        "en": "Button 3 single press",
-        "nl": "Een maal gedrukt op knop 3"
-      },
-      "args": [{
-        "name": "device",
-        "type": "device",
-        "filter": "driver_id=MT2652"
-      }]
-    }, {
-      "id": "mt2652_btn3_double",
-      "title": {
-        "en": "Button 3 double press",
-        "nl": "Twee maal gedrukt op knop 3"
-      },
-      "args": [{
-        "name": "device",
-        "type": "device",
-        "filter": "driver_id=MT2652"
-      }]
-    }, {
-      "id": "mt2652_btn4_single",
-      "title": {
-        "en": "Button 4 single press",
-        "nl": "Een maal gedrukt op knop 4"
-      },
-      "args": [{
-        "name": "device",
-        "type": "device",
-        "filter": "driver_id=MT2652"
-      }]
-    }, {
-      "id": "mt2652_btn4_double",
-      "title": {
-        "en": "Button 4 double press",
-        "nl": "Twee maal gedrukt op knop 4"
-      },
-      "args": [{
-        "name": "device",
-        "type": "device",
-        "filter": "driver_id=MT2652"
-      }]
-    }]
-  },
-  "drivers": [
-    {
-    "id": "MT2652",
-    "name": {
-      "en": "Devolo Scene Switch (Z-Wave Plus)"
-    },
-    "zwave": {
-      "manufacturerId": 373,
-      "productTypeId": 256,
-      "productId": 257,
-      "learnmode": {
-        "image": "/drivers/MT2652/assets/learnmode.svg",
-        "instruction": {
-          "en": "Activate inclusion on the device by pressing any one of the four buttons for one second",
-          "nl": "Om paiting te activeren, druk langer een seconde op een van de knoppen van de schakelaar."
-        }
-      },
-      "associationGroups": [
-        1,
-        2,
-        3,
-        4,
-        5
-      ]
-    },
-    "class": "light",
-    "capabilities": [
-      "measure_battery"
-    ],
-    "images": {
-      "large": "/drivers/MT2652/assets/images/large.png",
-      "small": "/drivers/MT2652/assets/images/small.png"
-    },
-    "settings": [
-      {
-      "id": "button_1_and_3_pair_mode",
-      "type": "dropdown",
-      "label": {
-        "en": "Button 1 and 3 pair mode"
-      },
-      "value": "1",
-      "hint": {
-        "en": "The parameter determines the behaviour of buttons 1 and 3."
-      },
-      "values": [{
-        "id": "0",
-        "label": {
-          "en": "(0) Seperately, In separate mode button 1 works with control group A, button 3 with control group C. Click is On, Hold is dimming Up, Double click is Off, Click-Hold is dimming Down. "
-        }
-      }, {
-        "id": "1",
-        "label": {
-          "en": "(1) Pair without double clicks, In pair button A/C are Up/Down correspondingly. Click is On/Off, Hold is dimming Up/Down. Single clicks works with group B and D"
-        }
-      }, {
-        "id": "2",
-        "label": {
-          "en": "(2) Pair with double clicks. In pair button A/C are Up/Down correspondingly. Click is On/Off, Hold is dimming Up/Down. Single clicks works with group B,double click with group D"
-        }
-      }]
-    },
-      {
-      "id": "button_2_and_4_pair_mode",
-      "type": "dropdown",
-      "label": {
-        "en": "Button 2 and 4 pair mode"
-      },
-      "value": "1",
-      "hint": {
-        "en": "The parameter determines the behaviour of buttons 2 and 4."
-      },
-      "values": [{
-        "id": "0",
-        "label": {
-          "en": "(0) Seperately, In separate mode button 2 works with control group B, button 4 with control group D. Click is On, Hold is dimming Up, Double click is Off, Click-Hold is dimming Down. "
-        }
-      }, {
-        "id": "1",
-        "label": {
-          "en": "(1) Pair without double clicks, In pair button B/D are Up/Down correspondingly. Click is On/Off, Hold is dimming Up/Down. Single clicks works with group B and D"
-        }
-      }, {
-        "id": "2",
-        "label": {
-          "en": "(2) Pair with double clicks. In pair button B/D are Up/Down correspondingly. Click is On/Off, Hold is dimming Up/Down. Single clicks works with group B,double click with group D"
-        }
-      }]
-    },
-      {
-      "id": "command_to_control_group_a",
-      "type": "dropdown",
-      "label": {
-        "en": "Command to Control Group A"
-      },
-      "value": "8",
-      "hint": {
-        "en": "This parameter defines the command to be sent to devices of control group A when the related button is pressed."
-      },
-      "values": [{
-        "id": "0",
-        "label": {
-          "en": "(0) Disabled"
-        }
-      }, {
-        "id": "1",
-        "label": {
-          "en": "(1) Switch On/Off and Dim (send Basic Set and Switch Multilevel)"
-        }
-      }, {
-        "id": "2",
-        "label": {
-          "en": "(3) Switch On/Off only (send Basic Set)"
-        }
-      }, {
-        "id": "3",
-        "label": {
-          "en": "(3) Switch All"
-        }
-      }, {
-        "id": "4",
-        "label": {
-          "en": "(4) Send Scenes"
-        }
-      }, {
-        "id": "5",
-        "label": {
-          "en": "(5) Send Preconfigured Scenes"
-        }
-      }, {
-        "id": "7",
-        "label": {
-          "en": "(7) Control DoorLock"
-        }
-      }, {
-        "id": "8",
-        "label": {
-          "en": "(8) Central Scene to Gateway (Default)"
-        }
-      }]
-    },
-      {
-      "id": "command_to_control_group_b",
-      "type": "dropdown",
-      "label": {
-        "en": "Command to Control Group B"
-      },
-      "value": "8",
-      "hint": {
-        "en": "This parameter defines the command to be sent to devices of control group B when the related button is pressed."
-      },
-      "values": [{
-        "id": "0",
-        "label": {
-          "en": "(0) Disabled"
-        }
-      }, {
-        "id": "1",
-        "label": {
-          "en": "(1) Switch On/Off and Dim (send Basic Set and Switch Multilevel)"
-        }
-      }, {
-        "id": "2",
-        "label": {
-          "en": "(3) Switch On/Off only (send Basic Set)"
-        }
-      }, {
-        "id": "3",
-        "label": {
-          "en": "(3) Switch All"
-        }
-      }, {
-        "id": "4",
-        "label": {
-          "en": "(4) Send Scenes"
-        }
-      }, {
-        "id": "5",
-        "label": {
-          "en": "(5) Send Preconfigured Scenes"
-        }
-      }, {
-        "id": "7",
-        "label": {
-          "en": "(7) Control DoorLock"
-        }
-      }, {
-        "id": "8",
-        "label": {
-          "en": "(8) Central Scene to Gateway (Default)"
-        }
-      }]
-    },
-      {
-      "id": "command_to_control_group_c",
-      "type": "dropdown",
-      "label": {
-        "en": "Command to Control Group C"
-      },
-      "value": "8",
-      "hint": {
-        "en": "This parameter defines the command to be sent to devices of control group C when the related button is pressed."
-      },
-      "values": [{
-        "id": "0",
-        "label": {
-          "en": "(0) Disabled"
-        }
-      }, {
-        "id": "1",
-        "label": {
-          "en": "(1) Switch On/Off and Dim (send Basic Set and Switch Multilevel)"
-        }
-      }, {
-        "id": "2",
-        "label": {
-          "en": "(3) Switch On/Off only (send Basic Set)"
-        }
-      }, {
-        "id": "3",
-        "label": {
-          "en": "(3) Switch All"
-        }
-      }, {
-        "id": "4",
-        "label": {
-          "en": "(4) Send Scenes"
-        }
-      }, {
-        "id": "5",
-        "label": {
-          "en": "(5) Send Preconfigured Scenes"
-        }
-      }, {
-        "id": "7",
-        "label": {
-          "en": "(7) Control DoorLock"
-        }
-      }, {
-        "id": "8",
-        "label": {
-          "en": "(8) Central Scene to Gateway (Default)"
-        }
-      }]
-    },
-      {
-      "id": "command_to_control_group_d",
-      "type": "dropdown",
-      "label": {
-        "en": "Command to Control Group D"
-      },
-      "value": "8",
-      "hint": {
-        "en": "This parameter defines the command to be sent to devices of control group D when the related button is pressed."
-      },
-      "values": [{
-        "id": "0",
-        "label": {
-          "en": "(0) Disabled"
-        }
-      }, {
-        "id": "1",
-        "label": {
-          "en": "(1) Switch On/Off and Dim (send Basic Set and Switch Multilevel)"
-        }
-      }, {
-        "id": "2",
-        "label": {
-          "en": "(3) Switch On/Off only (send Basic Set)"
-        }
-      }, {
-        "id": "3",
-        "label": {
-          "en": "(3) Switch All"
-        }
-      }, {
-        "id": "4",
-        "label": {
-          "en": "(4) Send Scenes"
-        }
-      }, {
-        "id": "5",
-        "label": {
-          "en": "(5) Send Preconfigured Scenes"
-        }
-      }, {
-        "id": "7",
-        "label": {
-          "en": "(7) Control DoorLock"
-        }
-      }, {
-        "id": "8",
-        "label": {
-          "en": "(8) Central Scene to Gateway (Default)"
-        }
-      }]
-    },
-      {
-      "id": "send_the_following_switch_sll_commands",
-      "type": "dropdown",
-      "label": {
-        "en": "Switch All commands"
-      },
-      "value": "1",
-      "hint": {
-        "en": "Send the following Switch All commands."
-      },
-      "values": [{
-        "id": "1",
-        "label": {
-          "en": "(1) Switch off only. (Default)"
-        }
-      }, {
-        "id": "2",
-        "label": {
-          "en": "(2) Switch on only."
-        }
-      }, {
-        "id": "255",
-        "label": {
-          "en": "(255) Switch all on and off"
-        }
-      }]
-    },
-      {
-      "id": "invert_buttons",
-      "type": "checkbox",
-      "label": {
-        "en": "Invert buttons"
-      },
-      "value": false,
-      "hint": {
-        "en": "Invert the behaviour of the buttons."
-      }
+	"id": "com.devolo",
+	"name": {
+		"en": "Devolo"
+	},
+	"version": "1.0.2",
+	"compatibility": ">=1.0.2",
+	"description": {
+		"en": "Devolo z-wave devices for Homey",
+		"nl": "Devolo z-wave devices voor Homey"
+	},
+	"category": [
+		"appliances",
+		"lights",
+		"climate"
+	],
+	"images": {
+		"large": "/assets/images/large.png",
+		"small": "/assets/images/small.png"
+	},
+	"author": {
+		"name": "Bram Oosterhuis",
+		"email": "bram.oosterhuis.nl@gmail.com"
+	},
+	"contributors": {
+		"developers": [{
+			"name": "Bram Oosterhuis",
+			"email": "bram.oosterhuis.nl@gmail.com"
+		}, {
+			"name": "Michel de Ru",
+			"email": "michel@de-ru.net"
+		}]
+	},
+	"flow": {
+		"triggers": [{
+			"id": "mt2652_btn1_single",
+			"title": {
+				"en": "Button 1 single press",
+				"nl": "Een maal gedrukt op knop 1"
+			},
+			"args": [{
+				"name": "device",
+				"type": "device",
+				"filter": "driver_id=MT2652"
+			}]
+		}, {
+			"id": "mt2652_btn1_double",
+			"title": {
+				"en": "Button 1 double press",
+				"nl": "Twee maal gedrukt op knop 1"
+			},
+			"args": [{
+				"name": "device",
+				"type": "device",
+				"filter": "driver_id=MT2652"
+			}]
+		}, {
+			"id": "mt2652_btn2_single",
+			"title": {
+				"en": "Button 2 single press",
+				"nl": "Een maal gedrukt op knop 2"
+			},
+			"args": [{
+				"name": "device",
+				"type": "device",
+				"filter": "driver_id=MT2652"
+			}]
+		}, {
+			"id": "mt2652_btn2_double",
+			"title": {
+				"en": "Button 2 double press",
+				"nl": "Twee maal gedrukt op knop 2"
+			},
+			"args": [{
+				"name": "device",
+				"type": "device",
+				"filter": "driver_id=MT2652"
+			}]
+		}, {
+			"id": "mt2652_btn3_single",
+			"title": {
+				"en": "Button 3 single press",
+				"nl": "Een maal gedrukt op knop 3"
+			},
+			"args": [{
+				"name": "device",
+				"type": "device",
+				"filter": "driver_id=MT2652"
+			}]
+		}, {
+			"id": "mt2652_btn3_double",
+			"title": {
+				"en": "Button 3 double press",
+				"nl": "Twee maal gedrukt op knop 3"
+			},
+			"args": [{
+				"name": "device",
+				"type": "device",
+				"filter": "driver_id=MT2652"
+			}]
+		}, {
+			"id": "mt2652_btn4_single",
+			"title": {
+				"en": "Button 4 single press",
+				"nl": "Een maal gedrukt op knop 4"
+			},
+			"args": [{
+				"name": "device",
+				"type": "device",
+				"filter": "driver_id=MT2652"
+			}]
+		}, {
+			"id": "mt2652_btn4_double",
+			"title": {
+				"en": "Button 4 double press",
+				"nl": "Twee maal gedrukt op knop 4"
+			},
+			"args": [{
+				"name": "device",
+				"type": "device",
+				"filter": "driver_id=MT2652"
+			}]
+		}]
+	},
+	"drivers": [{
+		"id": "MT2652",
+		"name": {
+			"en": "Devolo Scene Switch (Z-Wave Plus)"
+		},
+		"zwave": {
+			"manufacturerId": 373,
+			"productTypeId": 256,
+			"productId": 257,
+			"learnmode": {
+				"image": "/drivers/MT2652/assets/learnmode.svg",
+				"instruction": {
+					"en": "Activate inclusion on the device by pressing any one of the four buttons for one second",
+					"nl": "Om pairing te activeren, druk langer een seconde op een van de knoppen van de schakelaar."
+				}
+			},
+			"associationGroups": [
+				1,
+				2,
+				3,
+				4,
+				5
+			]
+		},
+		"class": "light",
+		"capabilities": [
+			"measure_battery"
+		],
+		"images": {
+			"large": "/drivers/MT2652/assets/images/large.png",
+			"small": "/drivers/MT2652/assets/images/small.png"
+		},
+		"settings": [{
+			"id": "button_1_and_3_pair_mode",
+			"type": "dropdown",
+			"label": {
+				"en": "Button 1 and 3 pair mode"
+			},
+			"value": "1",
+			"hint": {
+				"en": "The parameter determines the behaviour of buttons 1 and 3."
+			},
+			"values": [{
+				"id": "0",
+				"label": {
+					"en": "(0) Seperately, In separate mode button 1 works with control group A, button 3 with control group C. Click is On, Hold is dimming Up, Double click is Off, Click-Hold is dimming Down. "
+				}
+			}, {
+				"id": "1",
+				"label": {
+					"en": "(1) Pair without double clicks, In pair button A/C are Up/Down correspondingly. Click is On/Off, Hold is dimming Up/Down. Single clicks works with group B and D"
+				}
+			}, {
+				"id": "2",
+				"label": {
+					"en": "(2) Pair with double clicks. In pair button A/C are Up/Down correspondingly. Click is On/Off, Hold is dimming Up/Down. Single clicks works with group B,double click with group D"
+				}
+			}]
+		}, {
+			"id": "button_2_and_4_pair_mode",
+			"type": "dropdown",
+			"label": {
+				"en": "Button 2 and 4 pair mode"
+			},
+			"value": "1",
+			"hint": {
+				"en": "The parameter determines the behaviour of buttons 2 and 4."
+			},
+			"values": [{
+				"id": "0",
+				"label": {
+					"en": "(0) Seperately, In separate mode button 2 works with control group B, button 4 with control group D. Click is On, Hold is dimming Up, Double click is Off, Click-Hold is dimming Down. "
+				}
+			}, {
+				"id": "1",
+				"label": {
+					"en": "(1) Pair without double clicks, In pair button B/D are Up/Down correspondingly. Click is On/Off, Hold is dimming Up/Down. Single clicks works with group B and D"
+				}
+			}, {
+				"id": "2",
+				"label": {
+					"en": "(2) Pair with double clicks. In pair button B/D are Up/Down correspondingly. Click is On/Off, Hold is dimming Up/Down. Single clicks works with group B,double click with group D"
+				}
+			}]
+		}, {
+			"id": "command_to_control_group_a",
+			"type": "dropdown",
+			"label": {
+				"en": "Command to Control Group A"
+			},
+			"value": "8",
+			"hint": {
+				"en": "This parameter defines the command to be sent to devices of control group A when the related button is pressed."
+			},
+			"values": [{
+				"id": "0",
+				"label": {
+					"en": "(0) Disabled"
+				}
+			}, {
+				"id": "1",
+				"label": {
+					"en": "(1) Switch On/Off and Dim (send Basic Set and Switch Multilevel)"
+				}
+			}, {
+				"id": "2",
+				"label": {
+					"en": "(3) Switch On/Off only (send Basic Set)"
+				}
+			}, {
+				"id": "3",
+				"label": {
+					"en": "(3) Switch All"
+				}
+			}, {
+				"id": "4",
+				"label": {
+					"en": "(4) Send Scenes"
+				}
+			}, {
+				"id": "5",
+				"label": {
+					"en": "(5) Send Preconfigured Scenes"
+				}
+			}, {
+				"id": "7",
+				"label": {
+					"en": "(7) Control DoorLock"
+				}
+			}, {
+				"id": "8",
+				"label": {
+					"en": "(8) Central Scene to Gateway (Default)"
+				}
+			}]
+		}, {
+			"id": "command_to_control_group_b",
+			"type": "dropdown",
+			"label": {
+				"en": "Command to Control Group B"
+			},
+			"value": "8",
+			"hint": {
+				"en": "This parameter defines the command to be sent to devices of control group B when the related button is pressed."
+			},
+			"values": [{
+				"id": "0",
+				"label": {
+					"en": "(0) Disabled"
+				}
+			}, {
+				"id": "1",
+				"label": {
+					"en": "(1) Switch On/Off and Dim (send Basic Set and Switch Multilevel)"
+				}
+			}, {
+				"id": "2",
+				"label": {
+					"en": "(3) Switch On/Off only (send Basic Set)"
+				}
+			}, {
+				"id": "3",
+				"label": {
+					"en": "(3) Switch All"
+				}
+			}, {
+				"id": "4",
+				"label": {
+					"en": "(4) Send Scenes"
+				}
+			}, {
+				"id": "5",
+				"label": {
+					"en": "(5) Send Preconfigured Scenes"
+				}
+			}, {
+				"id": "7",
+				"label": {
+					"en": "(7) Control DoorLock"
+				}
+			}, {
+				"id": "8",
+				"label": {
+					"en": "(8) Central Scene to Gateway (Default)"
+				}
+			}]
+		}, {
+			"id": "command_to_control_group_c",
+			"type": "dropdown",
+			"label": {
+				"en": "Command to Control Group C"
+			},
+			"value": "8",
+			"hint": {
+				"en": "This parameter defines the command to be sent to devices of control group C when the related button is pressed."
+			},
+			"values": [{
+				"id": "0",
+				"label": {
+					"en": "(0) Disabled"
+				}
+			}, {
+				"id": "1",
+				"label": {
+					"en": "(1) Switch On/Off and Dim (send Basic Set and Switch Multilevel)"
+				}
+			}, {
+				"id": "2",
+				"label": {
+					"en": "(3) Switch On/Off only (send Basic Set)"
+				}
+			}, {
+				"id": "3",
+				"label": {
+					"en": "(3) Switch All"
+				}
+			}, {
+				"id": "4",
+				"label": {
+					"en": "(4) Send Scenes"
+				}
+			}, {
+				"id": "5",
+				"label": {
+					"en": "(5) Send Preconfigured Scenes"
+				}
+			}, {
+				"id": "7",
+				"label": {
+					"en": "(7) Control DoorLock"
+				}
+			}, {
+				"id": "8",
+				"label": {
+					"en": "(8) Central Scene to Gateway (Default)"
+				}
+			}]
+		}, {
+			"id": "command_to_control_group_d",
+			"type": "dropdown",
+			"label": {
+				"en": "Command to Control Group D"
+			},
+			"value": "8",
+			"hint": {
+				"en": "This parameter defines the command to be sent to devices of control group D when the related button is pressed."
+			},
+			"values": [{
+				"id": "0",
+				"label": {
+					"en": "(0) Disabled"
+				}
+			}, {
+				"id": "1",
+				"label": {
+					"en": "(1) Switch On/Off and Dim (send Basic Set and Switch Multilevel)"
+				}
+			}, {
+				"id": "2",
+				"label": {
+					"en": "(3) Switch On/Off only (send Basic Set)"
+				}
+			}, {
+				"id": "3",
+				"label": {
+					"en": "(3) Switch All"
+				}
+			}, {
+				"id": "4",
+				"label": {
+					"en": "(4) Send Scenes"
+				}
+			}, {
+				"id": "5",
+				"label": {
+					"en": "(5) Send Preconfigured Scenes"
+				}
+			}, {
+				"id": "7",
+				"label": {
+					"en": "(7) Control DoorLock"
+				}
+			}, {
+				"id": "8",
+				"label": {
+					"en": "(8) Central Scene to Gateway (Default)"
+				}
+			}]
+		}, {
+			"id": "send_the_following_switch_sll_commands",
+			"type": "dropdown",
+			"label": {
+				"en": "Switch All commands"
+			},
+			"value": "1",
+			"hint": {
+				"en": "Send the following Switch All commands."
+			},
+			"values": [{
+				"id": "1",
+				"label": {
+					"en": "(1) Switch off only. (Default)"
+				}
+			}, {
+				"id": "2",
+				"label": {
+					"en": "(2) Switch on only."
+				}
+			}, {
+				"id": "255",
+				"label": {
+					"en": "(255) Switch all on and off"
+				}
+			}]
+		}, {
+			"id": "invert_buttons",
+			"type": "checkbox",
+			"label": {
+				"en": "Invert buttons"
+			},
+			"value": false,
+			"hint": {
+				"en": "Invert the behaviour of the buttons."
+			}
 
-    },
-      {
-      "id": "blocks_wakeup_even_when_wakeup_interval_is_set",
-      "type": "dropdown",
-      "label": {
-        "en": "Blocks wakeup even when wakeup interval is set."
-      },
-      "value": "1",
-      "hint": {
-        "en": "If the device wakes up and there is no controller nearby, several unsuccessful communication attempts will drain battery."
-      },
-      "values": [{
-        "id": "0",
-        "label": {
-          "en": "(0) Wakeup is blocked"
-        }
-      }, {
-        "id": "1",
-        "label": {
-          "en": "(1) Wakeup is possible if configured accordingly. (Default)"
-        }
-      }]
-    },
-      {
-      "id": "send_unsolicited_battery_report_on_wake_up",
-      "type": "dropdown",
-      "label": {
-        "en": "Send unsolicited Battery Report on Wake Up "
-      },
-      "value": "1",
-      "values": [{
-        "id": "0",
-        "label": {
-          "en": "(0) No."
-        }
-      }, {
-        "id": "1",
-        "label": {
-          "en": "(1) To same node as wake up notification. (Default)"
-        }
-      }, {
-        "id": "2",
-        "label": {
-          "en": "(2) Broadcast to neighbours."
-        }
-      }]
-    }]
-  },
-    {
-      "id": "014G0801",
-      "name": {
-        "en": "Devolo Home Control Radiator Thermostat",
-        "nl": "Devolo Home Control Radiatorthermostaat"
-      },
-      "zwave": {
-        "manufacturerId": 373,
-        "productTypeId": 5,
-        "wakeUpInterval": 300,
-        "productId": 373,
-        "learnmode": {
-          "instruction": {
-            "en": "Press the middle button on your Devolo radiator thermostat.",
-            "nl": "Druk op de middelste knop van de Devolo radiatorthermostaat."
-          }
-        },
-        "associationGroups": [
-          1
-        ]
-      },
-      "class": "thermostat",
-      "capabilities": [
-        "target_temperature",
-        "measure_battery"
-      ],
-      "capabilitiesOptions": {
-        "target_temperature": {
-          "min": 4,
-          "max": 28
-        }
-      },
-      "images": {
-        "large": "/drivers/014G0801/assets/images/large.jpg",
-        "small": "/drivers/014G0801/assets/images/small.jpg"
-      }
-    }
-  ]
-}
+		}, {
+			"id": "blocks_wakeup_even_when_wakeup_interval_is_set",
+			"type": "dropdown",
+			"label": {
+				"en": "Blocks wakeup even when wakeup interval is set."
+			},
+			"value": "1",
+			"hint": {
+				"en": "If the device wakes up and there is no controller nearby, several unsuccessful communication attempts will drain battery."
+			},
+			"values": [{
+				"id": "0",
+				"label": {
+					"en": "(0) Wakeup is blocked"
+				}
+			}, {
+				"id": "1",
+				"label": {
+					"en": "(1) Wakeup is possible if configured accordingly. (Default)"
+				}
+			}]
+		}, {
+			"id": "send_unsolicited_battery_report_on_wake_up",
+			"type": "dropdown",
+			"label": {
+				"en": "Send unsolicited Battery Report on Wake Up "
+			},
+			"value": "1",
+			"values": [{
+				"id": "0",
+				"label": {
+					"en": "(0) No."
+				}
+			}, {
+				"id": "1",
+				"label": {
+					"en": "(1) To same node as wake up notification. (Default)"
+				}
+			}, {
+				"id": "2",
+				"label": {
+					"en": "(2) Broadcast to neighbours."
+				}
+			}]
+		}]
+	}, {
+		"id": "014G0801",
+		"name": {
+			"en": "Home Control Radiator Thermostat",
+			"nl": "Home Control Radiatorthermostaat"
+		},
+		"zwave": {
+			"manufacturerId": 2,
+			"productTypeId": 5,
+			"productId": 373,
+			"wakeUpInterval": 300,
+			"learnmode": {
+				"image": "drivers/014G0801/assets/learnmode.svg",
+				"instruction": {
+					"en": "Press the middle button on your Devolo Home Control Radiator Thermostat",
+					"nl": "Druk op de middelste knop van de Devolo Home Control Radiatorthermostaat"
+				}
+			},
+			"associationGroups": 1
+		},
+		"class": "thermostat",
+		"capabilities": [
+			"target_temperature",
+			"measure_temperature",
+			"measure_battery"
+		],
+		"capabilitiesOptions": {
+			"target_temperature": {
+				"min": 4,
+				"max": 28
+			}
+		},
+		"images": {
+			"small": "drivers/014G0801/assets/images/small.png",
+			"large": "drivers/014G0801/assets/images/large.png"
+		}
+	}]
+}
\ No newline at end of file
diff --git a/drivers/014G0801/assets/learnmode.svg b/drivers/014G0801/assets/learnmode.svg
new file mode 100644
index 0000000..ba2fb09
--- /dev/null
+++ b/drivers/014G0801/assets/learnmode.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="250" height="200" preserveAspectRatio="xMidYMid meet"><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none" class=""/><metadata>
+Created by potrace 1.10, written by Peter Selinger 2001-2011
+</metadata><g class="currentLayer"><title>Layer 1</title><g transform="translate(0,250) scale(0.10000000149011612,-0.10000000149011612) " fill="#000000" stroke="none" id="svg_1" class=""><path d="M986.0000228881836,2119.588233947754 c-48,-43 -76,-98 -92,-182 c-11,-58 -16,-67 -62,-105 c-28,-23 -61,-53 -73,-67 c-74,-80 -140,-143 -214,-207 c-180,-152 -241,-207 -251,-225 c-6,-10 -13,-50 -16,-87 c-13,-159 92,-328 260,-417 c58,-30 79,-36 135,-37 c85,-1 103,9 239,126 c60,50 129,108 153,128 c25,20 56,47 70,59 c14,12 39,29 57,36 c17,7 37,19 45,26 c7,8 47,41 88,75 c114,92 128,111 141,178 c7,33 20,72 31,87 c10,15 18,43 18,66 c0,23 4,44 10,47 c17,11 94,-18 115,-42 c38,-45 113,-79 191,-88 c57,-7 63,-6 95,22 c30,26 38,28 74,21 c22,-4 49,-10 61,-11 c11,-2 27,-8 35,-12 c23,-15 72,-6 96,17 c50,47 80,192 50,245 c-19,33 -58,60 -107,73 c-25,6 -62,16 -82,21 c-26,7 -43,19 -53,39 c-24,46 -78,68 -186,75 c-46,4 -62,1 -83,-16 c-23,-18 -31,-19 -58,-10 c-38,13 -38,13 -38,1 c0,-5 11,-10 23,-10 c35,0 37,-8 16,-44 c-40,-67 -59,-143 -54,-217 c4,-64 2,-70 -13,-64 c-9,4 -31,9 -47,12 c-30,5 -31,7 -31,56 c0,36 -9,71 -28,112 c-21,45 -28,73 -27,113 c1,31 -2,52 -8,52 c-6,0 -11,-21 -11,-46 l0,-46 l-36,32 c-32,28 -73,50 -92,50 c-4,0 13,-13 38,-29 c87,-54 138,-130 146,-214 l4,-52 l-13,40 c-8,22 -21,55 -31,73 c-25,48 -122,141 -170,163 c-37,17 -36,24 4,20 c12,-2 12,0 2,7 c-18,12 40,24 74,16 c13,-3 24,-2 24,3 c0,15 -66,14 -112,-2 c-36,-13 -168,-26 -168,-17 c0,10 31,61 44,71 c9,8 16,18 16,24 c0,20 -42,-28 -61,-71 c-19,-40 -43,-62 -55,-49 c-9,9 35,100 63,130 c18,18 22,27 12,27 c-12,0 -12,2 1,10 c8,5 12,11 10,13 c-3,2 -23,-7 -45,-21 c-38,-22 -35,-24 9,-6 c14,5 11,-2 -12,-35 c-17,-24 -36,-58 -42,-77 c-8,-24 -17,-34 -26,-30 c-8,3 -14,1 -14,-4 c0,-5 -6,-7 -13,-4 c-7,2 -34,-7 -61,-20 l-49,-25 l6,44 c4,23 14,61 23,84 c13,34 21,41 43,40 c14,0 35,-4 46,-8 c11,-5 25,-4 33,1 c13,11 17,29 5,26 c-5,-1 -23,2 -41,6 c-36,9 -38,26 -4,41 c12,5 22,13 22,17 c0,14 -9,9 -49,-28 zm56,-50 c-7,-7 -76,9 -72,16 c3,5 21,3 40,-3 c19,-6 34,-12 32,-13 zm734,-108 c-10,-12 -5,-16 33,-21 c25,-4 46,-11 46,-16 c0,-9 -34,-4 -77,12 c-38,14 -75,-52 -99,-176 c-17,-86 -17,-119 0,-168 c18,-48 -1,-46 -26,4 c-25,48 -23,149 3,228 c22,64 90,151 119,151 c10,0 10,-3 1,-14 zm129,-5 l25,-7 l-25,-7 c-30,-8 -100,2 -100,14 c0,10 64,10 100,0 zm-614,-33 c64,-29 145,-113 180,-184 c34,-69 43,-153 21,-204 l-14,-35 l-8,40 c-14,78 -80,196 -144,261 c-59,59 -161,124 -195,124 c-24,0 -19,18 7,23 c39,9 105,-2 153,-25 zm673,8 c9,-11 7,-12 -12,-9 c-16,3 -34,-5 -56,-23 c-33,-27 -33,-27 -29,-4 c2,16 14,27 38,36 c46,16 46,16 59,0 zm-784,-40 c86,-42 192,-151 235,-241 c43,-89 53,-203 25,-265 c-15,-33 -121,-140 -139,-140 c-3,0 -1,12 4,26 c16,42 11,131 -11,196 c-41,124 -145,245 -259,301 c-56,28 -75,32 -142,32 c-54,0 -74,3 -65,10 c8,6 35,28 61,50 c67,56 91,66 166,62 c48,-2 82,-10 125,-31 zm646,18 c25,-6 26,-8 18,-50 c-5,-24 -14,-54 -21,-67 c-6,-12 -13,-33 -13,-47 c-5,-82 -6,-86 -14,-65 c-5,11 -5,28 0,37 c12,23 11,28 -5,22 c-8,-3 -32,0 -55,6 c-47,12 -50,25 -24,92 c27,70 44,90 67,83 c12,-3 33,-8 47,-11 zm150,-4 c28,-15 23,-27 -9,-22 c-65,9 -122,-85 -122,-200 c0,-71 21,-116 61,-130 c34,-12 29,-25 -17,-44 c-28,-12 -39,-12 -57,-2 c-12,6 -31,11 -43,10 c-25,-3 -79,16 -71,25 c4,3 0,11 -8,17 c-15,12 -33,97 -27,134 c4,23 19,23 79,1 c25,-9 46,-71 41,-122 c-3,-30 -5,-32 -38,-30 l-35,2 l30,-9 c38,-12 55,-6 55,19 c0,19 2,18 25,-4 c25,-26 59,-33 70,-15 c3,6 -1,7 -10,4 c-8,-4 -26,1 -40,10 c-49,32 -55,143 -14,250 c10,27 15,54 12,60 c-3,6 -3,8 2,4 c4,-4 23,6 42,22 c37,33 45,35 74,20 zm27,-39 l24,-6 l-21,-19 c-12,-11 -21,-24 -21,-30 c0,-6 6,-4 13,4 c7,8 21,22 32,30 c15,11 14,7 -4,-13 c-14,-15 -22,-30 -18,-33 c4,-4 15,4 26,17 c18,23 88,39 75,17 c-4,-6 2,-7 17,-3 c23,7 23,6 -3,-14 c-16,-13 -28,-27 -28,-33 c0,-5 14,2 31,16 c17,14 36,26 42,26 c7,0 0,-10 -15,-21 c-16,-11 -28,-26 -28,-32 c0,-6 10,-1 23,11 c57,53 97,0 88,-118 c-2,-30 -4,-32 -12,-15 c-8,16 -9,15 -5,-10 c11,-81 -100,-162 -139,-101 c-17,26 -22,89 -11,156 c5,35 4,41 -4,27 c-6,-9 -14,-50 -17,-90 c-6,-61 -8,-68 -15,-42 c-7,28 1,94 17,138 c4,9 3,17 -3,17 c-12,0 -36,-112 -30,-145 c3,-14 2,-25 -3,-25 c-17,0 -13,113 6,163 c4,9 3,17 -3,17 c-14,0 -36,-115 -28,-152 c5,-24 4,-30 -5,-21 c-12,12 -8,124 6,156 c4,9 3,17 -2,17 c-15,0 -37,-104 -30,-142 c6,-27 5,-30 -4,-14 c-11,19 -7,112 7,152 c5,15 4,16 -6,7 c-21,-19 -25,-136 -7,-173 l16,-32 l-27,7 c-69,17 -92,68 -76,173 c8,56 18,78 52,115 c26,27 46,31 90,18 zm-1025,-90 c71,-25 128,-64 193,-133 c128,-136 172,-341 93,-430 l-21,-23 l16,27 c71,121 19,306 -124,442 c-88,83 -163,119 -250,120 c-52,1 -73,-4 -104,-23 c-22,-14 -36,-19 -32,-12 c14,22 89,51 132,51 c22,0 66,-9 97,-19 zm35,-46 c142,-71 253,-229 260,-370 c6,-112 0,-120 -213,-296 c-215,-176 -222,-181 -205,-148 c8,14 11,49 8,98 c-7,104 -50,192 -138,282 c-86,87 -160,124 -252,124 c-38,0 -68,1 -68,2 c0,1 37,32 83,69 c45,38 84,71 87,74 c26,27 205,174 227,185 c51,27 132,19 211,-20 zm735,-1 c15,-3 27,-10 27,-16 c0,-5 -8,-7 -17,-4 c-10,3 -30,8 -45,12 c-16,3 -28,10 -28,16 c0,5 8,7 18,4 c9,-3 29,-8 45,-12 zm-1155,-356 c74,-35 158,-115 202,-191 c39,-69 39,-77 -7,-71 c-29,3 -33,2 -18,-5 c11,-5 30,-10 42,-10 c22,-1 27,-10 38,-74 c8,-49 -17,-136 -47,-164 c-28,-27 -89,-53 -121,-53 c-21,0 -25,6 -31,41 c-7,46 -2,59 24,59 c10,0 31,13 46,29 l28,30 l39,-20 c21,-11 42,-18 45,-15 c3,4 -13,14 -36,23 c-42,16 -42,16 -42,69 c0,69 -28,132 -87,195 c-61,66 -113,92 -181,93 c-48,1 -57,-2 -83,-32 l-29,-32 l-40,20 c-45,23 -45,22 -26,58 c48,93 155,112 284,50 zm-22,-98 c135,-66 212,-254 135,-331 c-53,-53 -150,-31 -232,53 c-123,126 -116,298 13,298 c23,0 61,-9 84,-20 zm-236,-24 c34,-17 36,-20 36,-70 c1,-61 43,-154 89,-198 c26,-23 30,-35 27,-63 c-2,-19 -7,-35 -11,-35 c-24,0 -161,177 -161,208 c0,7 13,10 33,7 c30,-4 30,-4 -6,7 c-30,9 -39,18 -47,47 c-12,42 -13,124 -2,119 c4,-2 23,-12 42,-22 zm196,-320 c11,-8 38,-19 61,-25 c37,-10 41,-14 47,-52 c4,-23 5,-43 4,-45 c-6,-5 -105,32 -132,49 c-20,14 -24,21 -17,40 c4,12 6,28 4,35 c-6,16 8,15 33,-2 z" id="svg_2"/><path d="M2050.0000228881836,1815.588233947754 c-10,-11 -14,-20 -9,-20 c5,0 15,9 22,20 c7,11 11,20 9,20 c-2,0 -12,-9 -22,-20 z" id="svg_3"/><path d="M2074.0000228881836,1803.588233947754 c-12,-23 -12,-23 10,-4 c23,21 26,26 11,26 c-5,0 -15,-10 -21,-22 z" id="svg_4"/><path d="M2148.0000228881836,1753.588233947754 c-42,-47 -56,-144 -27,-186 c8,-12 21,-22 29,-22 c15,0 65,56 65,73 c0,7 -7,3 -15,-8 c-8,-11 -22,-28 -31,-37 c-38,-39 -60,32 -29,92 c16,32 34,37 66,20 c17,-10 19,-7 19,28 c0,62 -38,82 -77,40 zm47,-24 c0,-9 -5,-14 -12,-12 c-18,6 -21,28 -4,28 c9,0 16,-7 16,-16 z" id="svg_5"/><path d="M2086.0000228881836,1688.588233947754 c-15,-52 -14,-87 4,-130 c21,-50 28,-37 9,16 c-12,35 -13,54 -4,94 c13,60 6,75 -9,20 z" id="svg_6"/><path d="M490.0000228881836,1368.588233947754 c30,-7 38,-19 13,-20 c-11,-1 -26,-7 -32,-13 c-8,-8 -4,-10 14,-5 c14,3 39,1 55,-6 c69,-26 81,-28 82,-8 c2,16 -1,17 -18,8 c-12,-6 -23,-8 -27,-5 c-3,3 -1,6 5,6 c6,0 13,7 17,15 c4,13 2,13 -14,5 c-25,-13 -43,-9 -52,13 c-5,11 -17,17 -35,16 c-21,-1 -23,-3 -8,-6 z" id="svg_7"/><path d="M787.0000228881836,1035.588233947754 c-16,-26 -15,-35 2,-21 c11,10 15,8 18,-6 c2,-10 6,-13 10,-8 c3,6 1,20 -6,32 c-11,22 -12,22 -24,3 z" id="svg_8"/><path d="M464.0000228881836,1254.588233947754 c-28,-10 -49,-46 -49,-83 c0,-39 50,-124 97,-166 c159,-139 271,11 127,170 c-62,68 -125,96 -175,79 zm113,-38 c49,-31 77,-65 102,-125 c20,-48 20,-75 0,-104 c-41,-59 -170,4 -225,110 c-25,48 -26,123 -1,137 c31,18 77,12 124,-18 z" id="svg_9"/><path d="M525.0000228881836,1127.588233947754 c0,-5 7,-15 15,-22 c8,-7 15,-9 15,-6 c0,4 -7,14 -15,22 c-8,9 -15,11 -15,6 z" id="svg_10"/><path d="M584.0000228881836,1118.588233947754 c-13,-16 -12,-17 4,-4 c9,7 17,15 17,17 c0,8 -8,3 -21,-13 z" id="svg_11"/><path d="M312.0000228881836,1188.588233947754 c11,-32 15,-34 29,-16 c18,24 18,38 -1,23 c-10,-9 -15,-9 -15,-1 c0,6 -4,11 -10,11 c-5,0 -7,-8 -3,-17 z" id="svg_12"/><path d="M547.0000228881836,892.5882339477539 c-14,-17 2,-42 22,-34 c20,8 20,21 2,36 c-10,8 -16,8 -24,-2 zm23,-17 c3,-5 1,-10 -4,-10 c-6,0 -11,5 -11,10 c0,6 2,10 4,10 c3,0 8,-4 11,-10 z" id="svg_13"/><path d="M1093.0000228881836,2145.588233947754 c34,-5 63,-16 78,-31 c13,-12 24,-18 24,-11 c0,26 -52,52 -104,51 l-51,-1 l53,-8 z" id="svg_14"/><path d="M1205.0000228881836,2095.588233947754 c0,-4 10,-10 23,-14 c13,-3 36,-17 51,-31 c15,-14 34,-25 42,-25 c22,0 21,0 65,-15 c48,-17 49,-17 49,-7 c0,4 -28,14 -62,22 c-34,7 -70,22 -82,34 c-22,22 -86,49 -86,36 z" id="svg_15"/><path d="M1037.0000228881836,2000.588233947754 c0,-16 2,-22 5,-12 c2,9 2,23 0,30 c-3,6 -5,-1 -5,-18 z" id="svg_16"/><path d="M1475.0000228881836,1991.588233947754 c42,-17 60,-19 60,-7 c0,6 -8,9 -17,9 c-10,0 -31,2 -48,6 c-27,6 -27,5 5,-8 z" id="svg_17"/><path d="M1420.0000228881836,1975.588233947754 c3,-5 11,-10 16,-10 c6,0 7,5 4,10 c-3,6 -11,10 -16,10 c-6,0 -7,-4 -4,-10 z" id="svg_18"/><path d="M1574.0000228881836,1970.588233947754 c18,-8 38,-15 45,-15 c6,1 -4,7 -23,15 c-18,8 -38,15 -45,15 c-6,-1 4,-7 23,-15 z" id="svg_19"/></g></g></svg>
\ No newline at end of file
diff --git a/drivers/014G0801/driver.js b/drivers/014G0801/driver.js
index 1648c64..b96adf7 100644
--- a/drivers/014G0801/driver.js
+++ b/drivers/014G0801/driver.js
@@ -3,64 +3,112 @@
 const path = require('path');
 const ZwaveDriver = require('homey-zwavedriver');
 
-// http://www.vesternet.com/downloads/dl/file/id/196/product/1128/z_wave_danfoss_lc_13_living_connect_radiator_thermostat_manual.pdf
+// Get the driver object
+var driver = findWhere(Homey.manifest.drivers, { id: path.basename(__dirname) });
+// Get the wakeUpInterval from the driver object (in order to set the pollInterval to the same value)
+var wakeUpInterval = driver.zwave.wakeUpInterval * 1000;
+Homey.log("Will set pollInterval to the same value as wakeUpInterval, which is: " + wakeUpInterval + " ms");
+
+// http://www.vesternet.com/downloads/dl/file/id/196/z_wave_danfoss_lc_13_living_connect_radiator_thermostat_manual.pdf
+// http://www.devolo.co.uk/fileadmin/user_upload/Products/devolo-Home-Control-Radiator-Control/Documents/PDF_en/Manual-devolo-Home-Control-Radiator-Thermostat-com.pdf
+// http://products.z-wavealliance.org/products/1258/embedpics
+// http://heating.danfoss.com/PCMPDF/Z_wave_commands_VDFNN202_teamcent.pdf
+// http://www.benext.eu/static/manual/danfoss/livingconnect.pdf
 
 module.exports = new ZwaveDriver(path.basename(__dirname), {
+	debug: true,
 	capabilities: {
-		measure_battery: {
+		measure_battery: {			
+			// http://z-wave.sigmadesigns.com/wp-content/uploads/2016/08/SDS12657-12-Z-Wave-Command-Class-Specification-A-M.pdf, page 125
+			// 
+			// The Battery Level Get Command is used to request the level of a battery.
+			// The Battery Level Report Command MUST be returned in response to this command.
+			//
+			// The Battery Command Class is used to request and report battery levels for a given device.
+			// The battery level reports percentage of the full battery.
+			// The field can take values from 0 to 100% (0x00–0x64).
+			// The value 0xFF indicates a battery low warning.
+			//
 			command_class: 'COMMAND_CLASS_BATTERY',
 			command_get: 'BATTERY_GET',
 			command_report: 'BATTERY_REPORT',
 			command_report_parser: report => {
-				if (report['Battery Level'] === "battery low warning") return 1;
-				return report['Battery Level (Raw)'][0];
-			}
+				var batt_level = report['Battery Level (Raw)'][0];
+				// 0xFF is a special value to indicate the battery is low
+				return (batt_level == 0xFF) ? 1 : batt_level;
+			},
+			pollInterval: wakeUpInterval
+		},
+		
+		measure_temperature: {
+			// http://z-wave.sigmadesigns.com/wp-content/uploads/2016/08/SDS12657-12-Z-Wave-Command-Class-Specification-A-M.pdf, page 525
+			//
+			command_class: 'COMMAND_CLASS_SENSOR_MULTILEVEL',
+			command_get: 'SENSOR_MULTILEVEL_GET',
+			command_get_parser: () => {
+				return {
+					'Sensor Type': 'Temperature (version 1)',
+					'Properties1': {
+						'Scale': 0
+					}
+				};
+			},
+			command_report: 'SENSOR_MULTILEVEL_REPORT',
+			command_report_parser: report => {
+				return Math.round (report['Sensor Value (Parsed)'] * 10) / 10;
+			},
+			pollInterval: wakeUpInterval
 		},
+		
 		target_temperature: {
+			// http://z-wave.sigmadesigns.com/wp-content/uploads/2016/08/SDS12652-13-Z-Wave-Command-Class-Specification-N-Z.pdf, page 321
+			//
 			command_class: 'COMMAND_CLASS_THERMOSTAT_SETPOINT',
 			command_get: 'THERMOSTAT_SETPOINT_GET',
-			command_get_parser: function () {
+			command_get_parser: () => {
 				return {
 					'Level': {
 						'Setpoint Type': 'Heating 1',
 					}
 				};
 			},
+			command_report: 'THERMOSTAT_SETPOINT_REPORT',
+			command_report_parser: report => {	
+				if (report.hasOwnProperty('Level2') &&
+					report.Level2.hasOwnProperty('Precision') &&
+					report.Level2.hasOwnProperty('Size')) {
+						const scale = Math.pow(10, report.Level2['Precision']);
+						return report['Value'].readUIntBE(0, report.Level2['Size']) / scale;
+						//console.log(report['Value'].readUIntBE(0, report.Level2['Size']) / scale);
+					}					
+			},
 			command_set: 'THERMOSTAT_SETPOINT_SET',
-			command_set_parser: function (value) {
+			command_set_parser: value => {
+				// make temperature a whole number
+				let temp = Math.round(value*10);
 
-				// Create value buffer
-				let a = new Buffer(2);
-				a.writeUInt16BE(( Math.round(value * 2) / 2 * 10).toFixed(0));
+				// create 2 byte buffer of the value
+				const tempByte1 = Math.floor(temp/255);
+				const tempByte2 = Math.round(temp-(255*tempByte1));
+				temp = new Buffer([tempByte1, tempByte2]);
 
 				return {
-					'Level' : {
-						'Setpoint Type': 'Heating 1'
-					},
-					'Level2': {
-						'Size': 2,
-						'Scale': 0,
-						'Precision': 1
-					},
-					'Value': a
+					'Level': new Buffer([1]), // Reserved = 0 (bits: 000), Setpoint Type = 1 (Heating)(bits: 00001)
+					'Level2': new Buffer([34]), // Precision = 1 (bits: 001), Scale = 0 (bits: 00), Size = 2 (bits: 010)
+					'Value': temp
 				};
 			},
-			command_report: 'THERMOSTAT_SETPOINT_REPORT',
-			command_report_parser: report => {
-				if (report.hasOwnProperty('Level2')
-					&& report.Level2.hasOwnProperty('Scale')
-					&& report.Level2.hasOwnProperty('Precision')
-					&& report.Level2['Scale'] === 0
-					&& report.Level2['Size'] !== 'undefined'
-					&& typeof report['Value'].readUIntBE(0, report.Level2['Size']) !== 'undefined') {
-
-					return report['Value'].readUIntBE(0, report.Level2['Size']) / Math.pow(10, report.Level2['Precision']);
-				}
-				return null;
-			},
-		},
-	},
-	settings: {
-
+			pollInterval: wakeUpInterval
+		}
 	}
-});
\ No newline at end of file
+});
+
+/**
+ * Plain js implementation of underscore's findWhere.
+ * @param array
+ * @param criteria
+ * @returns {*}
+ */
+function findWhere(array, criteria) {
+	return array.find(item => Object.keys(criteria).every(key => item[key] === criteria[key]));
+}
diff --git a/package.json b/package.json
index c22d6a5..3aacbcd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.devolo",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "This app adds support for Devolo devices in Homey",
   "main": "app.js",
   "dependencies": {