Code merged from ship-simu repository