fixed client
Merge branch 'late' of https://github.com/ouchliu/System-Measurement-Project into late