Updated for use with catkin.