fixes 3
Merge branch 'kill_list' of https://github.com/marckavatar/dojo_rules into kill_list