Non-Linear Waves in Dispersive Media