Updated to work with node 0.10.x