Signal handler
Merge pull request #1422 from psav/signal_handler

Signal handler