Added untested code fixes #3
Merge pull request #4 from aforward/kill_list

Added untested code fixes #3