Sync with rest of ROS-I. Also fix #41.