Fixed getting the remote ip
Merge branch 'master' into kingman