WIP: Optionally kill running instance of command

I made those commits on top of #12.