Merge node branch to master