fixed-btn combine
Merge pull request #7 from Gourdboy/master

fixed-btn 代码合并