Updated CMakeLists.txt and package.xml.