Fixed non-working matrix-reading code
Merge branch 'origin/master'