diff --git a/appveyor.yml b/appveyor.yml
index c774a77..aef7b0a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,8 @@ environment:
     - nodejs_version: "5"
     - nodejs_version: "6"
     - nodejs_version: "7"
+    - nodejs_version: "8"
+    - nodejs_version: "9"
 
 install:
   - ps: Install-Product node $env:nodejs_version
diff --git a/lib/tmp.js b/lib/tmp.js
index 1175a4f..3d49831 100644
--- a/lib/tmp.js
+++ b/lib/tmp.js
@@ -547,6 +547,24 @@ function _safely_install_listener() {
     }
   }
 
+  // windows does not support signals
+  // it'd never had won if it wasn't a major PITA
+  // with node v8.x and win 10 this is no longer an issue
+  if (process.platform == 'win32') {
+    var rl = require("readline").createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    rl.on("SIGINT", function () {
+      process.emit("SIGINT");
+    });
+  }
+
+  process.on('SIGINT', function () {
+    process.exit(0);
+  });
+
   process.addListener(EVENT, function _tmp$safe_listener(data) {
     if (existingListeners.length) {
       for (var i = 0, length = existingListeners.length; i < length; i++) {
@@ -559,7 +577,6 @@ function _safely_install_listener() {
 
 _safely_install_listener();
 
-
 /**
  * Configuration options.
  *
diff --git a/package-lock.json b/package-lock.json
index 136640c..8ec7480 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "tmp",
-  "version": "0.0.33",
+  "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/test/child-process.js b/test/child-process.js
index 20c6c02..9716594 100644
--- a/test/child-process.js
+++ b/test/child-process.js
@@ -19,7 +19,7 @@ module.exports.genericChildProcess = function spawnGenericChildProcess(configFil
   _do_spawn(command_args, cb);
 };
 
-module.exports.childProcess = function spawnChildProcess(configFile, cb) {
+module.exports.childProcess = function spawnChildProcess(configFile, cb, detach) {
   var
     configFilePath = path.join(__dirname, 'outband', configFile),
     command_args = [path.join(__dirname, 'spawn-custom.js'), configFilePath];
@@ -28,10 +28,16 @@ module.exports.childProcess = function spawnChildProcess(configFile, cb) {
   if (!existsSync(configFilePath))
     return cb(new Error('ENOENT: configFile ' + configFilePath + ' does not exist'));
 
-  _do_spawn(command_args, cb);
+  if (arguments.length > 2) {
+    for (var i=2; i<arguments.length; i++) {
+      command_args.push(arguments[i]);
+    }
+  }
+
+  _do_spawn(command_args, cb, detach);
 }
 
-function _do_spawn(command_args, cb) {
+function _do_spawn(command_args, cb, detach) {
   var
     node_path = process.argv[0],
     stdoutBufs = [],
@@ -43,7 +49,7 @@ function _do_spawn(command_args, cb) {
 
   // spawn doesn’t have the quoting problems that exec does,
   // especially when going for Windows portability.
-  child = spawn(node_path, command_args);
+  child = spawn(node_path, command_args, detach ? { detached:true } : undefined);
   child.stdin.end();
   // TODO:we no longer support node 0.6
   // Cannot use 'close' event because not on node-0.6.
diff --git a/test/issue121-test.js b/test/issue121-test.js
new file mode 100644
index 0000000..50f2dde
--- /dev/null
+++ b/test/issue121-test.js
@@ -0,0 +1,27 @@
+/* eslint-disable no-octal */
+// vim: expandtab:ts=2:sw=2
+
+const
+  assert = require('assert'),
+  assertions = require('./assertions'),
+  childProcess = require('./child-process').childProcess,
+  signals = ['SIGINT', 'SIGTERM'];
+
+describe('tmp', function () {
+  describe('issue121 - clean up on terminating signals', function () {
+    for (var i=0; i<signals.length; i++) {
+      it(signals[i], issue121Tests(signals[i]));
+    }
+  });
+});
+
+function issue121Tests(signal) {
+  return function (done) {
+    childProcess('issue121.json', function (err, stderr, stdout) {
+      if (err) return done(err);
+      else if (stderr) return done(new Error(stderr));
+      else assertions.assertDoesNotExist(stdout);
+      done();
+    }, true);
+  };
+}
diff --git a/test/outband/issue121.js b/test/outband/issue121.js
new file mode 100644
index 0000000..a0d8a68
--- /dev/null
+++ b/test/outband/issue121.js
@@ -0,0 +1,20 @@
+/* eslint-disable no-octal */
+// vim: expandtab:ts=2:sw=2
+
+var
+  fs = require('fs'),
+  tmp = require('../../lib/tmp'),
+  // we reuse the fixtures from issue62 here
+  fixture = require('./issue62');
+
+tmp.setGracefulCleanup();
+
+// https://github.com/raszi/node-tmp/issues/121
+module.exports = function (signal) {
+  fixture.apply(this, [tmp.dirSync({ unsafeCleanup: true }), tmp]);
+
+  // make sure that the process keeps running
+  setTimeout(function () {}, 100);
+
+  this.kill(signal);
+};
diff --git a/test/outband/issue121.json b/test/outband/issue121.json
new file mode 100644
index 0000000..86429e8
--- /dev/null
+++ b/test/outband/issue121.json
@@ -0,0 +1,3 @@
+{
+  "tc": "issue121"
+}
diff --git a/test/spawn-custom.js b/test/spawn-custom.js
index bb1cc27..d450635 100644
--- a/test/spawn-custom.js
+++ b/test/spawn-custom.js
@@ -8,7 +8,13 @@ var
 var config = readJsonConfig(process.argv[2]);
 spawn.graceful = !!config.graceful;
 
+var args = [];
+
+for (var i=3; i<process.argv.length; i++) {
+  args[i-3] = process.argv[i];
+}
+
 // import the test case function and execute it
 var fn = require(path.join(__dirname, 'outband', config.tc));
-fn.apply(spawn);
+fn.apply(spawn, args);
 
diff --git a/test/spawn.js b/test/spawn.js
index 9635e94..1ec3a6c 100644
--- a/test/spawn.js
+++ b/test/spawn.js
@@ -34,7 +34,7 @@ module.exports = {
     process.exit(code || 0);
   },
   kill: function (signal) {
-    process.kill(signal || 'SIGINT');
+    process.kill(process.pid, signal || 'SIGINT');
   }
 };