Osmatrix3

merge OSMatrix branch