[ros-dev] merging code to 0.2.8