add more blacklist
resolve
resolve
merge
merge
Merge branch 'master' of https://github.com/fredfeng/Scuba