underwater_simulation update
Merge pull request #969 from marioprats/master

underwater_simulation update