Merge pull request #2 from IbpTeam/master

merge to wosidaideshi