complete client part.
Merge pull request #2 from pbesedm/feature/client

complete client part.