fix control-c? (Seems to work, could use review)
Merge branch 'fix-ctrl-c'