fix two issues
Merge branch 'master' of https://github.com/LabelClient/Client