listen for SIGTERM, SIGHUP and SIGKILL as well
merge master