switch to node.js almost ok, more models
Merge remote-tracking branch 'origin/master'