Finish fixes #4
Merge pull request #5 from milanopetrovic/kill_list

Finish fixes #4