Fix cli handling of server announcements.

Fixes #120.
Merge branch 'master' into merged