Updated for node 0.6
merge