Adding client Changes
Merge pull request #7 from lingow/Client

Adding client Changes