+ Some refactoring to Matrix
+ Added CsvRead and test cases