fix bug when there are more than one server with the same host and the same port
0.9.7
Merge branch 'release/0.9.7'