change the localhost to the ip address.
Merge remote-tracking branch 'origin/master'