diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52cbcf644104e66f2d48dd53d359feb42cdf7041..d331a654ce272c7f5a499a13fb08017988a2ff5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,20 +2,35 @@ cmake_minimum_required(VERSION 3.0.2)
 project(tutorial_ros_pub_sub)
 
 ## Find catkin and any catkin packages
-find_package(catkin REQUIRED COMPONENTS roscpp rospy std_msgs message_generation)
+find_package(catkin REQUIRED COMPONENTS roscpp rospy std_msgs message_generation genmsg)
 
 ## Declare ROS messages and services
-add_message_files(FILES Num.msg)
-add_service_files(FILES AddTwoInts.srv)
+add_message_files(
+	FILES
+	Num.msg
+)
+
+add_service_files(
+	FILES 
+	AddTwoInts.srv
+)
 
 ## Generate added messages and services
-generate_messages(DEPENDENCIES std_msgs)
+generate_messages(
+	DEPENDENCIES
+	std_msgs
+)
 
 ## Declare a catkin package
 catkin_package(
     CATKIN_DEPENDS message_runtime
 )
 
+include_directories(
+  include
+  ${catkin_INCLUDE_DIRS}
+)
+
 ## Build talker and listener
 include_directories(include ${catkin_INCLUDE_DIRS})
 
@@ -27,6 +42,8 @@ target_link_libraries(listener ${catkin_LIBRARIES})
 
 add_executable(add_two_ints_server src/add_two_ints_server.cpp)
 target_link_libraries(add_two_ints_server ${catkin_LIBRARIES})
+#add_dependencies(add_two_ints_server tutorial_ros_pub_sub_generate_gencpp)
 
 add_executable(add_two_ints_client src/add_two_ints_client.cpp)
 target_link_libraries(add_two_ints_client ${catkin_LIBRARIES})
+#add_dependencies(add_two_ints_client tutorial_ros_pub_sub_generate_gencpp)
diff --git a/package.xml b/package.xml
index 6a2d158e1985a03ae39670160f0bce97527233c2..c200295c917c01a340f15f4cfe21de6280584f7b 100644
--- a/package.xml
+++ b/package.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>tutorial_ros_pub_sub</name>
-  <version>0.0.0</version>
+  <version>1.0.0</version>
   <description>The tutorial_ros_pub_sub package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->
   <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
-  <maintainer email="sebastian@todo.todo">sebastian</maintainer>
+  <maintainer email="sebastian.ebert@tu-dresden.de">Sebastian Ebert</maintainer>
+  <maintainer email="johannes.mey@tu-dresden.de">Johannes Mey</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>Copyright by Willow Garage</license>
 
 
   <!-- Url tags are optional, but multiple are allowed, one per tag -->
@@ -32,7 +33,9 @@
   <!-- Dependencies can be catkin packages or system dependencies -->
   <!-- Examples: -->
   <!-- Use depend as a shortcut for packages that are both build and exec dependencies -->
-  <!--   <depend>roscpp</depend> -->
+  <depend>roscpp</depend>
+
+  <build_depend>std_msgs</build_depend>
   <!--   Note that this is equivalent to the following: -->
   <!--   <build_depend>roscpp</build_depend> -->
   <!--   <exec_depend>roscpp</exec_depend> -->
@@ -43,18 +46,13 @@
   <!-- Use buildtool_depend for build tool packages: -->
   <!--   <buildtool_depend>catkin</buildtool_depend> -->
   <!-- Use exec_depend for packages you need at runtime: -->
-<exec_depend>message_runtime</exec_depend>
+  <exec_depend>message_runtime</exec_depend>
   <!-- Use test_depend for packages you need only for testing: -->
   <!--   <test_depend>gtest</test_depend> -->
   <!-- Use doc_depend for packages you need only for building documentation: -->
   <!--   <doc_depend>doxygen</doc_depend> -->
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>roscpp</build_depend>
-  <build_depend>std_msgs</build_depend>
-  <build_export_depend>roscpp</build_export_depend>
-  <build_export_depend>std_msgs</build_export_depend>
-  <exec_depend>roscpp</exec_depend>
-  <exec_depend>std_msgs</exec_depend>
+
 
 
   <!-- The export tag contains other, unspecified, tags -->