Added ctrl-c management