Kill list

Merge the fixes to issue #3.