Feature/matrix vector support