Added client code
Merge pull request #2 from wj313/master

Added client code