fixes #3

pull request from kill_list to master