diff --git a/backend/js/ros_scripts.js b/backend/js/ros_scripts.js
index 800e1b9..477b52a 100644
--- a/backend/js/ros_scripts.js
+++ b/backend/js/ros_scripts.js
@@ -7,8 +7,32 @@ ros.recording = false;
 ros.connected = false;
 
 // ros.connectionName = 'ws://192.168.1.105:9090';
-ros.connectionName = 'ws://localhost:9090';
+
+function getQueryVariable(variable)
+{
+   var query = window.location.search.substring(1);
+   var vars = query.split("&");
+   for (var i=0;i<vars.length;i++) {
+           var pair = vars[i].split("=");
+           if(pair[0] == variable){
+            return pair[1];
+          }
+   }
+}
+
+var master = "localhost"
+master = getQueryVariable("master")
+if(master == null)
+{
+  master =  window.location.hostname
+  //"localhost"
+}
+console.log('Master = ' + master);
+
+ros.connectionName = 'ws://' + master + ':9090';
+// ros.connectionName = 'ws://localhost:9090';
 // ros.connectionName = 'ws://titan.aescape.co:9090';
+console.log('ros.connectionName = ' + ros.connectionName);
 
 // If there is an error on the backend, an 'error' emit will be emitted.
 ros.on('error', function(error) {
@@ -20,7 +44,7 @@ ros.on('error', function(error) {
   document.getElementById("ROSNodes").innerHTML = "No Nodes Detected";
 
   rosbridgeconnection_badge
-  console.log(error);192
+  console.log(error);
 });
 // Find out exactly when we made a connection.
 ros.on('connection', function() {