Added a great feature to let the solution die

I would like to have this merged into the main line.