Fixed to work with Express 4.0