Code merge from ship-simu