Change the way to get the IP address of the client
Merge branches 'develop' and 'master'