Fixed controll script to kill processes on exit.
Merge branch 'test' into dev