diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
index ae7437e2..0f5892e4 100644
--- a/urdf/CMakeLists.txt
+++ b/urdf/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8.3)
 project(urdf)
 
 find_package(Boost REQUIRED thread)
-find_package(urdfdom REQUIRED)
-find_package(urdfdom_headers REQUIRED)
+find_package(urdfdom_headers 0.4 REQUIRED)
+find_package(urdfdom 0.4 REQUIRED)
 find_package(catkin REQUIRED COMPONENTS
   urdf_parser_plugin pluginlib rosconsole_bridge roscpp cmake_modules)
 
@@ -32,7 +32,7 @@ include_directories(
   )
 link_directories(${catkin_LIBRARY_DIRS})
 
-add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp)
+add_library(${PROJECT_NAME} src/model.cpp src/sensor.cpp src/rosconsole_bridge.cpp)
 target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES})
 
 if(APPLE)
diff --git a/urdf/include/urdf/sensor.h b/urdf/include/urdf/sensor.h
new file mode 100644
index 00000000..a87d1977
--- /dev/null
+++ b/urdf/include/urdf/sensor.h
@@ -0,0 +1,64 @@
+/*********************************************************************
+* Software License Agreement (BSD License)
+* 
+*  Copyright (c) 2016 CITEC, Bielefeld University
+*  All rights reserved.
+* 
+*  Redistribution and use in source and binary forms, with or without
+*  modification, are permitted provided that the following conditions
+*  are met:
+* 
+*   * Redistributions of source code must retain the above copyright
+*     notice, this list of conditions and the following disclaimer.
+*   * Redistributions in binary form must reproduce the above
+*     copyright notice, this list of conditions and the following
+*     disclaimer in the documentation and/or other materials provided
+*     with the distribution.
+*   * Neither the name of the authors nor the names of its
+*     contributors may be used to endorse or promote products derived
+*     from this software without specific prior written permission.
+* 
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+*  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+*  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+*  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+*  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+*  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+*  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+*  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+*  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+*  POSSIBILITY OF SUCH DAMAGE.
+*********************************************************************/
+
+/* Author: Robert Haschke */
+
+#ifndef URDF_SENSOR_H
+#define URDF_SENSOR_H
+
+#include <string>
+#include <map>
+#include <urdf_parser/sensor_parser.h>
+#include <tinyxml.h>
+
+namespace urdf {
+
+/** Retrieve sensor parsers available through the plugin-lib mechanism
+    whose name matches any of the names listed in allowed.
+    If allowed is empty (the default), all parsers will be returned.
+*/
+urdf::SensorParserMap getSensorParsers(const std::vector<std::string> &allowed = std::vector<std::string>());
+
+/** Conveniency method returning the SensorParserMap for the given sensor name */
+urdf::SensorParserMap getSensorParser(const std::string &name);
+
+/** parse <sensor> tags in URDF document */
+SensorMap parseSensors(TiXmlDocument &doc, const urdf::SensorParserMap &parsers);
+SensorMap parseSensors(const std::string &xml, const urdf::SensorParserMap &parsers);
+SensorMap parseSensorsFromParam(const std::string &param, const urdf::SensorParserMap &parsers);
+SensorMap parseSensorsFromFile(const std::string &filename, const urdf::SensorParserMap &parsers);
+
+}
+
+#endif
diff --git a/urdf/package.xml b/urdf/package.xml
index 243b49af..568e0b70 100644
--- a/urdf/package.xml
+++ b/urdf/package.xml
@@ -20,8 +20,8 @@
 
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
 
-  <build_depend>liburdfdom-dev</build_depend>
-  <build_depend>liburdfdom-headers-dev</build_depend>
+  <build_depend version_gte="0.4">liburdfdom-dev</build_depend>
+  <build_depend version_gte="0.4">liburdfdom-headers-dev</build_depend>
   <build_depend>rosconsole_bridge</build_depend>
   <build_depend>roscpp</build_depend>
   <build_depend>urdf_parser_plugin</build_depend>
@@ -29,8 +29,8 @@
   <build_depend>cmake_modules</build_depend>
   <build_depend>rostest</build_depend>
 
-  <run_depend>liburdfdom-dev</run_depend>
-  <run_depend>liburdfdom-headers-dev</run_depend>
+  <run_depend version_gte="0.4">liburdfdom-dev</run_depend>
+  <run_depend version_gte="0.4">liburdfdom-headers-dev</run_depend>
   <run_depend>rosconsole_bridge</run_depend>
   <run_depend>roscpp</run_depend>
   <run_depend>urdf_parser_plugin</run_depend>
diff --git a/urdf/src/sensor.cpp b/urdf/src/sensor.cpp
new file mode 100644
index 00000000..45b6f461
--- /dev/null
+++ b/urdf/src/sensor.cpp
@@ -0,0 +1,129 @@
+/*********************************************************************
+* Software License Agreement (BSD License)
+* 
+*  Copyright (c) 2016 CITEC, Bielefeld University
+*  All rights reserved.
+* 
+*  Redistribution and use in source and binary forms, with or without
+*  modification, are permitted provided that the following conditions
+*  are met:
+* 
+*   * Redistributions of source code must retain the above copyright
+*     notice, this list of conditions and the following disclaimer.
+*   * Redistributions in binary form must reproduce the above
+*     copyright notice, this list of conditions and the following
+*     disclaimer in the documentation and/or other materials provided
+*     with the distribution.
+*   * Neither the name of the authors nor the names of its
+*     contributors may be used to endorse or promote products derived
+*     from this software without specific prior written permission.
+* 
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+*  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+*  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+*  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+*  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+*  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+*  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+*  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+*  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+*  POSSIBILITY OF SUCH DAMAGE.
+*********************************************************************/
+
+/* Author: Robert Haschke */
+
+#include "urdf/sensor.h"
+
+#include <ros/ros.h>
+#include <pluginlib/class_loader.h>
+#include <boost/shared_ptr.hpp>
+#include <algorithm>
+#include <fstream>
+
+namespace urdf {
+
+SensorMap parseSensorsFromFile(const std::string &filename, const SensorParserMap &parsers)
+{
+  SensorMap result;
+  std::ifstream stream(filename.c_str());
+  if (!stream.is_open())
+  {
+     throw std::runtime_error("Could not open file [" + filename + "] for parsing.");
+  }
+
+  std::string xml_string((std::istreambuf_iterator<char>(stream)),
+                         std::istreambuf_iterator<char>());
+  return parseSensors(xml_string, parsers);
+}
+
+
+SensorMap parseSensorsFromParam(const std::string &param, const SensorParserMap &parsers)
+{
+  ros::NodeHandle nh;
+  std::string xml_string;
+  
+  // gets the location of the robot description on the parameter server
+  std::string full_param;
+  if (!nh.searchParam(param, full_param)){
+    throw std::runtime_error("Could not find parameter " + param + " on parameter server");
+  }
+
+  // read the robot description from the parameter server
+  if (!nh.getParam(full_param, xml_string)){
+    throw std::runtime_error("Could not read parameter " + param + " on parameter server");
+  }
+  return parseSensors(xml_string, parsers);
+}
+
+
+SensorMap parseSensors(const std::string &xml_string, const SensorParserMap &parsers)
+{
+  TiXmlDocument xml_doc;
+  xml_doc.Parse(xml_string.c_str());
+  if (xml_doc.Error())
+     throw std::runtime_error(std::string("Could not parse the xml document: ") + xml_doc.ErrorDesc());
+  return parseSensors(xml_doc, parsers);
+}
+
+SensorParserMap getSensorParsers(const std::vector<std::string> &allowed)
+{
+  pluginlib::ClassLoader<urdf::SensorParser> loader("urdf", "urdf::SensorParser");
+  SensorParserMap parserMap;
+  try
+  {
+    const std::vector<std::string> &classes = loader.getDeclaredClasses();
+    for (std::size_t i = 0 ; i < classes.size() ; ++i)
+    {
+      // skip this class if not listed in allowed
+      if (!allowed.empty() && std::find(allowed.begin(), allowed.end(), classes[i]) == allowed.end())
+        continue;
+
+      urdf::SensorParserSharedPtr parser;
+      try {
+        parser = loader.createInstance(classes[i]);
+      } catch(const pluginlib::PluginlibException& ex) {
+        ROS_ERROR_STREAM("Failed to create sensor parser: " << classes[i] << "\n" << ex.what());
+      }
+      parserMap.insert(std::make_pair(classes[i], parser));
+      ROS_DEBUG_STREAM("added sensor parser: " << classes[i]);
+    }
+    if (parserMap.empty())
+      ROS_WARN_STREAM("No sensor parsers found");
+  }
+  catch(const pluginlib::PluginlibException& ex)
+  {
+    ROS_ERROR_STREAM("Exception while creating sensor plugin loader " << ex.what());
+  }
+  return parserMap;
+}
+
+SensorParserMap getSensorParser(const std::string &name)
+{
+  std::vector<std::string> allowed;
+  allowed.push_back(name);
+  return getSensorParsers(allowed);
+}
+
+} // namespace