Homework: matrix
Merge pull request #159 from Ivo-Valchev/master

Homework: matrix