more node-like implementation
Merge pull request #1 from fyockm/master

more node-like implementation