Bug Fix- client name replaced!
Merge origin/master