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

* upstream/master:
  Code style
  Add the easy-kill package