fixes #3
fixing the merge conflicts
Merge pull request #5 from mattgraham/kill_list

fixes #3