merging
fix style
Merge pull request #230 from ros-simulation/curranw-hydro-devel

merging pull request #214