this fixes #3 ok?
Merge branch 'release_branch_1.0'
another attempt to fix #3
Merge branch 'kill_list'