Fixes #3
Merge pull request #4 from aeferrari/kill_list

Fixes #3