diff --git a/www/frontend/controls_frontend.txt b/www/frontend/controls_frontend.txt
index f69be787d..a4c026e61 100644
--- a/www/frontend/controls_frontend.txt
+++ b/www/frontend/controls_frontend.txt
@@ -279,7 +279,7 @@ UPD 2013-11-15_03:17:04 9893 www/frontend/app/view/Viewport.js
 UPD 2013-11-22_05:34:29 10042 www/frontend/app/view/TableDataGridPanel.js
 UPD 2013-11-22_05:34:29 28202 www/frontend/app/view/LineChartPanel.js
 UPD 2013-11-15_04:48:21 87082 www/frontend/app/controller/ChartController.js
-UPD 2013-11-22_05:43:24 18375 www/frontend/app/controller/MainController.js
+UPD 2013-11-30_04:29:42 18670 www/frontend/app/controller/MainController.js
 UPD 2013-06-30_11:46:54 5415 www/frontend/app/controller/TableDataController.js
 UPD 2013-04-01_07:04:35 202 www/frontend/app/model/ReadingsModel.js
 UPD 2013-04-01_07:04:36 338 www/frontend/app/model/SavedChartsModel.js
diff --git a/www/frontend/www/frontend/app/controller/MainController.js b/www/frontend/www/frontend/app/controller/MainController.js
index babf019fb..7a3c3f7ea 100644
--- a/www/frontend/www/frontend/app/controller/MainController.js
+++ b/www/frontend/www/frontend/app/controller/MainController.js
@@ -95,7 +95,7 @@ Ext.define('FHEM.controller.MainController', {
         
         if (Ext.isDefined(FHEM.version)) {
             var sp = this.getStatustextfield();
-            sp.setText(FHEM.version + "; Frontend Version: 1.0.1 - 2013-11-22");
+            sp.setText(FHEM.version + "; Frontend Version: 1.0.2 - 2013-11-30");
         }
         
         this.setupTree(false);
@@ -145,21 +145,25 @@ Ext.define('FHEM.controller.MainController', {
                     if (result.devices && result.devices.length > 0) {
                         Ext.each(result.devices, function(device) {
                             if (device.ATTR && device.ATTR.room) {
-                                //check if room exists
-                                var resultnode = root.findChild("text", device.ATTR.room, true),
-                                    subnode = {text: device.NAME, leaf: true, data: device};
-                                if (!resultnode) {
-                                    //create roomfolder
-                                    var roomfolder;
-                                    if (device.ATTR.room !== "hidden") {
-                                        roomfolder = {text: device.ATTR.room, leaf: false, expanded: true, children: []};
-                                        roomfolder.children.push(subnode);
-                                        root.appendChild(roomfolder);
+                                //first we check if we have comma separated multiple rooms
+                                var roomArray = device.ATTR.room.split(",");
+                                Ext.each(roomArray, function(room) {
+                                  //check if room exists
+                                    var resultnode = root.findChild("text", room, true),
+                                        subnode = {text: device.NAME, leaf: true, data: device};
+                                    if (!resultnode) {
+                                        //create roomfolder
+                                        var roomfolder;
+                                        if (room !== "hidden") {
+                                            roomfolder = {text: room, leaf: false, expanded: true, children: []};
+                                            roomfolder.children.push(subnode);
+                                            root.appendChild(roomfolder);
+                                        }
+                                    } else {
+                                        resultnode.appendChild(subnode);
+                                        root.appendChild(resultnode);
                                     }
-                                } else {
-                                    resultnode.appendChild(subnode);
-                                    root.appendChild(resultnode);
-                                }
+                                });
                             }
                         }, this);
                     } else {