Much better SIGINT handling, but still need to test on Windows and Mac OS X