Make ctrl-c work again (close #43)