Kill list fixes #5
Merge branch 'kill_list'