Merge pull request #4 from TsinghuaCloud/master

update
u
Merge pull request #5 from TsinghuaCloud/wjp-branch

Wjp branch