diff --git a/config-sample-knx.json b/config-sample-knx.json
index 8e7d11e..df0de60 100644
--- a/config-sample-knx.json
+++ b/config-sample-knx.json
@@ -1,88 +1,121 @@
 {
-	"bridge": {
-		"name": "Homebridge",
-		"username": "CC:22:3D:E3:CE:30",
-		"port": 51826,
-		"pin": "031-45-154"
-	},
-	"description": "This is an example configuration file for KNX platform shim",
-	"platforms": 
-		[
-		 {
-			 "platform": "KNX",
-			 "name": "KNX",
-			 "knxd_ip": "192.168.178.205",
-			 "knxd_port": 6720,
-			 "accessories": 
-				 [
-				  {
-					  "accessory_type": "knxdevice",
-					  "name": "Living Room North Lamp",
-					  "services": 
-						  [
-						   {
-							   "type": "Lightbulb",
-							   "name": "Living Room North Lamp",
-							   "On": {
-								   "Set": "1/1/6",
-								   "Listen": [
-								              "1/1/63"
-								              ]
-							   },
-							   "Brightness": {
-								   "Set": "1/1/62",
-								   "Listen": [
-								              "1/1/64"
-								              ]
-							   }
-						   }
-						   ]
-				  },
-				  {
-					  "accessory_type": "knxdevice",
-					  "name": "Office",
-					  "services": 
-						  [
-						   {
-							   "type": "Lightbulb",
-							   "name": "Office Lamp",
-							   "On": {
-								   "Set": "1/3/5"
-							   }
-						   },
-						   {
-							   "type": "Thermostat",
-							   "name": "Raumtemperatur",
-							   "CurrentTemperature": {
-								   "Listen": "3/3/44"
-							   },
-							   "TargetTemperature": {
-								   "Set": "3/3/94"
-							   },
-							   "CurrentHeatingCoolingState": {
-								   "Listen": "3/3/64"
-							   }
-						   },
-						   {
-							   "type": "WindowCovering",
-							   "name": "Rollo",
-							   "Target": {
-								   "Set": "address",
-								   "Listen": "adresses"
-							   },
-							   "Current": {
-								   "Set": "address",
-								   "Listen": "adresses"
-							   },
-							   "PositionState": {
-								   "Listen": "adresses"
-							   }
-						   }
-						   ]
-				  }
-				  ]
-		 }
-		 ],
-		 "accessories": [],
-		 "prototyping": {}
+    "bridge": {
+        "name": "Homebridge",
+        "username": "CC:22:3D:E3:CE:30",
+        "port": 51826,
+        "pin": "031-45-154"
+    },
+    "description": "This is an example configuration file for KNX platform shim",
+    "hint": "Always paste into jsonlint.com validation page before starting your homebridge, saves a lot of frustration",
+    "platforms": [
+        {
+            "platform": "KNX",
+            "name": "KNX",
+            "knxd_ip": "192.168.178.205",
+            "knxd_port": 6720,
+            "accessories": [
+                {
+                    "accessory_type": "knxdevice",
+                    "description": "Only generic type knxdevice is supported, all previous knx type have been merged into that.",
+                    "name": "Living Room North Lamp",
+                    "services": [
+                        {
+                            "type": "Lightbulb",
+                            "description": "iOS8 Lightbulb type, supports On (Switch) and Brightness",
+                            "name": "Living Room North Lamp",
+                            "On": {
+                                "Set": "1/1/6",
+                                "Listen": [
+                                    "1/1/63"
+                                ]
+                            },
+                            "Brightness": {
+                                "Set": "1/1/62",
+                                "Listen": [
+                                    "1/1/64"
+                                ]
+                            }
+                        }
+                    ],
+                    "services-description": "Services is an array, you CAN have multiple service types in one accessory, though it is not fully supported in many iOS HK apps, such as EVE and myTouchHome"
+                },
+                {
+                    "accessory_type": "knxdevice",
+                    "name": "Office Temperature",
+                    "description": "iOS8.4.1 TemperatureSensor type, supports CurrentTemperature",
+                    "services": [
+                        {
+                            "type": "TemperatureSensor",
+                            "name": "Raumtemperatur",
+                            "CurrentTemperature": {
+                                "Listen": "3/3/44"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "accessory_type": "knxdevice",
+                    "name": "Office Window Lock",
+                    "services": [
+                        {
+                            "type": "LockMechanism",
+                            "description": "iOS8 Lock mechanism, Supports LockCurrentStateSecured0 OR LockCurrentState, LockTargetStateSecured0 OR LockTargetState, use depending if LOCKED is 0 or 1",
+                            "name": "Office Window Lock",
+                            "LockCurrentStateSecured0": {
+                                "Listen": "5/3/15"
+                            },
+                            "LockTargetStateSecured0": {
+                                "Listen": "5/3/15"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "accessory_type": "knxdevice",
+                    "description":"sample device with multiple services. Multiple services of different types are widely supported"
+                    "name": "Office",
+                    "services": [
+                        {
+                            "type": "Lightbulb",
+                            "name": "Office Lamp",
+                            "On": {
+                                "Set": "1/3/5"
+                            }
+                        },
+                        {
+                            "type": "Thermostat",
+                            "description": "iOS8 Thermostat type, supports CurrentTemperature, TargetTemperature, CurrentHeatingCoolingState ",
+                            "name": "Raumtemperatur",
+                            "CurrentTemperature": {
+                                "Listen": "3/3/44"
+                            },
+                            "TargetTemperature": {
+                                "Set": "3/3/94"
+                            },
+                            "CurrentHeatingCoolingState": {
+                                "Listen": "3/3/64"
+                            }
+                        },
+                        {
+                            "type": "WindowCovering",
+                            "description": "iOS9 Window covering (blinds etc) type, still WIP",
+                            "name": "Blinds",
+                            "Target": {
+                                "Set": "address",
+                                "Listen": "adresses"
+                            },
+                            "Current": {
+                                "Set": "address",
+                                "Listen": "adresses"
+                            },
+                            "PositionState": {
+                                "Listen": "adresses"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "accessories": []
 }
\ No newline at end of file
diff --git a/platforms/KNX.js b/platforms/KNX.js
index 7070137..573b3b9 100644
--- a/platforms/KNX.js
+++ b/platforms/KNX.js
@@ -47,24 +47,6 @@ KNXPlatform.prototype = {
 					this.log("created "+acc.name+" universal accessory");	
 					myAccessories.push(acc);
 					break;
-				case "knxlamp":
-					this.log("push new lamp with "+foundAccessories[int].name	);
-					foundAccessories[int].knxd_ip = this.config.knxd_ip;
-					foundAccessories[int].knxd_port = this.config.knxd_port;
-					var accConstructor = require('./../accessories/knxlamp.js');
-					var acc = new accConstructor.accessory(this.log,foundAccessories[int]);
-					this.log("created "+acc.name+" accessory");
-					myAccessories.push(acc);
-					break;
-				case "knxthermostat":
-					this.log("push new thermostat with "+foundAccessories[int].name);
-					foundAccessories[int].knxd_ip = this.config.knxd_ip;
-					foundAccessories[int].knxd_port = this.config.knxd_port;
-					var accConstructor = require('./../accessories/knxthermostat.js');
-					var acc = new accConstructor.accessory(this.log,foundAccessories[int]);
-					this.log("created "+acc.name+" accessory");
-					myAccessories.push(acc);
-					break;
 				default:
 					// do something else
 					this.log("unkown accessory type found")