Add override of local ip address resolution
Merge pull request #82 from katharosada/mercimaster

Add override of local ip address resolution