improved model and added some tests for Node
Merge remote-tracking branch 'origin/master'