Updated to support node v0.10.x