The second order theory for non-sinusoidal oscillations of a cylinder in a free surface