Merge pull request #1 from sunqianxiang/design

Design
Merge branch 'design'
Merge branch 'master' into design