Fixed client code
Merge pull request #3 from wj313/master

Fixed client code