cleared
fixes #3
Merge branch 'master' into kill_list