Non-Hydrostatic Free Surface Flows