Refactoring nodes
Merge remote-tracking branch 'origin/b_holmes_0_3'