diff --git a/launch/keyboard_teleop.launch b/launch/keyboard_teleop.launch
new file mode 100644
index 0000000000000000000000000000000000000000..bd9c1131cf4aa160155e190d3d6ce85fe3a25c4c
--- /dev/null
+++ b/launch/keyboard_teleop.launch
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!-- -->
+<launch>
+
+  <group ns="ana">
+    <node name="keyboard_teleop"
+          pkg ="teleop_twist_keyboard"
+          type="teleop_twist_keyboard.py"
+          output="screen">
+<!--      <remap from="/ana/cmd_vel"
+              to="/ana/teleop/cmd_vel_unsafe"/>-->
+    </node>
+  </group>
+
+</launch>
diff --git a/package.xml b/package.xml
index efeaf71b6d6ede0158426a60f98f4a0cbc135fda..762083b1b7f851d92493f6effee19e03b6f047aa 100644
--- a/package.xml
+++ b/package.xml
@@ -7,13 +7,13 @@
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->
   <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
-  <maintainer email="shernand@todo.todo">shernand</maintainer>
+  <maintainer email="labrobotica@iri.upc.edu">labrobotica</maintainer>
 
 
   <!-- One license tag required, multiple allowed, one license per tag -->
   <!-- Commonly used license strings: -->
   <!--   BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
-  <license>TODO</license>
+  <license>LGPL</license>
 
 
   <!-- Url tags are optional, but multiple are allowed, one per tag -->
@@ -25,7 +25,7 @@
   <!-- Author tags are optional, multiple are allowed, one per tag -->
   <!-- Authors do not have to be maintainers, but could be -->
   <!-- Example: -->
-  <!-- <author email="jane.doe@example.com">Jane Doe</author> -->
+  <author email="shernand@iri.upc.edu">Sergi Hernandez Juan</author>
 
 
   <!-- The *depend tags are used to specify dependencies -->