1. Added node deletion function
Merge remote-tracking branch 'Minerva/master'
1. Resolve conflicts