Fixes #6
fixes #6
Merge from kill_list to master