Merge pull request #28 from ChrisBoesch/master

update
debug with client
Merge pull request #440 from LI-HE/master

debug with client