Node completion
Merged with master