非同期改为异步
resove conflicts
Merge branch 'kaku87-patch-4'