Feature/catkin