tweaked up for node 10.0.x and express 3.0