Updated to reflect express 4.x changes