underwater_simulation update
Merge pull request #999 from marioprats/master

underwater_simulation update