merge changes from 0.8.9 to 0.8.10

hi  Omegaice,

here a merge from changes in current 0.8.10 test client