settings
Merge branch 'master' of https://github.com/AlexWang1993/watcher

merge.