conditional kill
Merge pull request #37 from carlocapocasa/conditionalKill

Conditional kill