* improve ip/port detection * improve numbers detection Change-Id: I66bf53dbff77cd6c7a23743e5883246486bfe533