add util.matrix
fixed module name
Merge branch 'develop' into release
Merge branch 'release'