Merge pull request #29 from yuyepaoniu/master

panel
Merge pull request #29 from bananaxzw/master

panel