Fixed Ping time out related issues, #107 #108