Non-linear waves in dispersive media