diff --git a/buildPy2exe.py b/buildPy2exe.py
index 7f91acc..164146b 100644
--- a/buildPy2exe.py
+++ b/buildPy2exe.py
@@ -582,7 +582,8 @@ guiIcons = ['resources/accept.png', 'resources/arrow_undo.png', 'resources/clock
      'resources/timeline_marker.png','resources/control_play_blue.png',
      'resources/mpc-hc.png','resources/mpc-hc64.png','resources/mplayer.png',
      'resources/mpv.png','resources/vlc.png', 'resources/house.png', 'resources/film_link.png',
-     'resources/eye.png', 'resources/comments.png', 'resources/cog_delete.png', 'resources/bullet_black.png'
+     'resources/eye.png', 'resources/comments.png', 'resources/cog_delete.png', 'resources/bullet_black.png',
+     'resources/controller.png', 'resources/key_go.png', 'resources/page_white_key.png'
     ]
 resources = ["resources/icon.ico", "resources/syncplay.png"]
 resources.extend(guiIcons)
diff --git a/resources/controller.png b/resources/controller.png
new file mode 100644
index 0000000..5cf76ed
Binary files /dev/null and b/resources/controller.png differ
diff --git a/resources/key_go.png b/resources/key_go.png
new file mode 100644
index 0000000..30b0dc3
Binary files /dev/null and b/resources/key_go.png differ
diff --git a/resources/page_white_key.png b/resources/page_white_key.png
new file mode 100644
index 0000000..d616484
Binary files /dev/null and b/resources/page_white_key.png differ
diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index 476c700..a041a3c 100644
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -6,7 +6,6 @@ import sys
 import time
 import re
 import os
-import threading
 from syncplay.utils import formatTime, sameFilename, sameFilesize, sameFileduration
 
 class MainWindow(QtGui.QMainWindow):
@@ -210,7 +209,17 @@ class MainWindow(QtGui.QMainWindow):
             self.mediadirectory = os.path.dirname(fileName)
             self.saveMediaBrowseSettings()
             self._syncplayClient._player.openFile(fileName)
-            
+
+    def createControlledRoom(self):
+        self._syncplayClient.createControlledRoom()
+
+    def identifyAsController(self):
+        tooltip = "Enter controller password for this room\r\n(see http://syncplay.pl/guide/ for usage instructions):"
+        name =  "Identify as Room Controller"
+        controlpassword, ok = QtGui.QInputDialog.getText(self, name, tooltip, QtGui.QLineEdit.Normal, "")
+        if ok and controlpassword != '':
+            self._syncplayClient.identifyAsController(controlpassword)
+
     def _extractSign(self, m):
         if m:
             if m == "-":
@@ -390,6 +399,11 @@ class MainWindow(QtGui.QMainWindow):
         window.advancedMenu = QtGui.QMenu(getMessage("advanced-menu-label"), self)
         window.setoffsetAction = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'timeline_marker.png'),getMessage("setoffset-menu-label"))
         window.setoffsetAction.triggered.connect(self.setOffset)
+
+        window.createcontrolledroomAction = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'page_white_key.png'), "&Create controlled room suffix")
+        window.createcontrolledroomAction.triggered.connect(self.createControlledRoom)
+        window.identifyascontroller = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'key_go.png'), "&Identify as room controller")
+        window.identifyascontroller.triggered.connect(self.identifyAsController)
         window.menuBar.addMenu(window.advancedMenu)
         
         window.helpMenu = QtGui.QMenu(getMessage("help-menu-label"), self)