added fix fixes #1 fixes #3
Merge pull request #2 from marckavatar/kill_list

added fix fixes #1 fixes #3