overhaul kill()
Merge pull request #96 from yetanotherhacker/overkil

overhaul kill()