revisions made so that catkin_make can compile using catkin_make