Merge pull request #94 from nhr/master

Enhanced IP address lookup on Broker host.