Added ping service.
Merge origin/master