some re-org on the client side
some re-org on the client side..
Editted README
Editted README
Merge remote-tracking branch 'upstream/master'