see description

- changed used Matrix library version;
- refactoring;