Non-linear Waves in dispersive media