diff --git a/matrix.c b/matrix.c
index d64a6e1..6564d7f 100644
--- a/matrix.c
+++ b/matrix.c
@@ -36,12 +36,16 @@ void clearMatrix(Matrix *matrix)
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-
+	matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    
+	if(rowIdx < matrix.rows && colIdx < matrix.cols){
+    	return matrix.buffer[rowIdx * matrix.cols + colIdx];
+	}else{
+		return 0;
+	}
 }
 
 Matrix add(const Matrix matrix1, const Matrix matrix2)