Added ping and retry when disconnected server/client
Merge branch 'master' of github.com:rockyhe/rockykevinleon