Matrix: Fix for compile error and memory leak
Merge pull request #1 from KrystianJozwiak/master

Matrix: Fix for compile error and memory leak