Merge NavalWar v0.07 (Alfredo)