small changes to CAH_Client
Merge pull request #286 from HoltMaki/master

small changes to CAH_Client