..
Merge remote-tracking branch 'origin/master'
Changed the stop flow a bit