Added ping handler
Merge branch 'dev'