Improved reading of matrix
Merge pull request #2 from Tifuera/matrix-read-impr

Improved reading of matrix