Hacks fixes #4
Merge pull request #5 from glorat/kill_list

Hacks fixes #4