Proceedings of the 7th International Conference on Ship Hydrodynamics, Oslo, Norway, 19-20 August 1954