Close handlers when process exit itself
Use kill method in stop
Merge branch 'use-kill-in-stop'