Merge pull request #31 from houkanshan/master

显示调整
Merge pull request #32 from houkanshan/master

更多滚
roll hack