Should fix github issue #11 and future proof for servers with more than ...

...one address of each type