matrix fixes
Merge branch 'icici' of https://github.com/algosystech/collosys into icici