Feature/optimizedmatrix - added the missing Scalar operations