Merged in node branch
README: Updated comment
Fixed conflicts;