Added node server
Merged