Add the easy-kill package
Code style
Merge remote-tracking branch 'upstream/master'