More configurable killing

your mom is a ;
Merge branch 'master' of github.com:addtheletters/TSA2014