Address fixes 4
Merge pull request #5 from kstojevich/kill_list

Address fixes 4