Merge pull request #1 from Korrigan/master

Work on master API and node basic implementation