Add SIGINT and SIGTERM to trap handler