Merge pull request #1 from IbpTeam/master

update from lbpTeam
Merge pull request #2 from woqidaideshi/master

Merge pull request #1 from IbpTeam/master