node.js sample rewrite
Merge pull request #2796 from sebv/sample-rewrite

Node.js sample rewrite