Resolve IP addr settings straight away
Merge pull request #141 from nhr/ip_discovery

Resolve IP addr settings straight away