#1016 - updated for NodeJS v0.10.x