made it work with node 0.10
merge