tui added quit options, stop tracking
Merge remote-tracking branch 'origin/master'