implement ping on server
Merge branch 'ping'