Matrix by Ivailo Ivanov
Merge pull request #173 from IvailoIvanov/master

Matrix by Ivailo Ivanov