调整代码，增加/ping
Merge remote-tracking branch 'origin/master'