dev2 make change
Merge pull request #1 from liuxiaogang/dev2

dev2 make change