Bug fixes for node
Merge pull request #5 from jasnell/master

Bug fixes for node