Merge pull request #1 from dvanliere/node

Node branch