merge to v4.7
Merge pull request #52 from 81552433qqcom/master

merge to v4.7