Refs #47: wait nodes process disappear when kill node
Refs #47: fix previous error commit
Merge branch 'gh47' into yan