Node.update refactored

Resolved #18, #15