Add logging to stop process and use sudo
Merge remote-tracking branch 'origin/master'