added timeout to Client, tweak timeout time to 30s