Updating control script to control stop and start
Merge remote-tracking branch 'origin/master'