Fix bug when clicking Start after clicking Stop
Merge remote-tracking branch 'origin/master'