fix path
Merge branch 'ping'