A Unified Riemann-Problem Based Extension of the Warming-Beam and Lax-Wendroff Schemes