updates from ros branch of iwaki