refactor client
Merge branch 'master' of github.com:binl/14740p3