解决SDK7.0带来的matrix命名冲突问题
Merge pull request #2 from binss/master

解决SDK7.0带来的matrix命名冲突问题
resolve conflict