New and improved four-parameter non-linear Muskingum model