Includes fixes #4
Merge pull request #5 from Freika/kill_list

Includes fixes #4