Added kill command support
Merge branch 'master' of github.com:longshoreman/controller