added better node support
Merge remote-tracking branch 'origin/ruby_general'