Node

Merging node branch to master.