improve sync, fix bugs
merge
Merge branch 'master' of https://github.com/anengineerinchina/dark-test-v2