Added a ping to reduce the number of socket connections required.
Merge remote-tracking branch 'origin/master'