Better way to get ip address
Merge branch 'master' into work-env