Merge pull request #174 from Ranjith15/master

client changes for ip
.
Merge remote-tracking branch 'upstream/master'