diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..0db5873
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "cmake.configureOnOpen": true
+}
\ No newline at end of file
diff --git a/pepper_bringup/launch/pepper_full.launch b/pepper_bringup/launch/pepper_full.launch
index 9eaaebb..be27a83 100644
--- a/pepper_bringup/launch/pepper_full.launch
+++ b/pepper_bringup/launch/pepper_full.launch
@@ -7,6 +7,8 @@
   <arg name="network_interface"   default="eth0" />
 
   <arg name="namespace"           default="$(optenv ROS_NAMESPACE pepper_robot)" />
+  <arg name="user"                default="" />
+  <arg name="password"            default="" />
 
   <!-- naoqi driver -->
   <include file="$(find naoqi_driver)/launch/naoqi_driver.launch">
@@ -15,6 +17,8 @@
     <arg name="roscore_ip"        value="$(arg roscore_ip)" />
     <arg name="network_interface" value="$(arg network_interface)" />
     <arg name="namespace"         value="$(arg namespace)" />
+    <arg name="user"              value="$(arg username)" />
+    <arg name="password"          value="$(arg password)" /> 
   </include>
 
   <!-- launch pose manager -->