diff --git a/cachematrix.R b/cachematrix.R
index a50be65aa44..f44760aaf14 100644
--- a/cachematrix.R
+++ b/cachematrix.R
@@ -1,15 +1,42 @@
-## Put comments here that give an overall description of what your
-## functions do
-
-## Write a short comment describing this function
-
-makeCacheMatrix <- function(x = matrix()) {
-
+# This function creates a special "matrix" object that can cache its inverse
+makeCacheMatrix <- function() {
+  mat <- NULL
+  inv_cache <- NULL
+ 
+  setMatrix <- function(x) {
+    mat <<- x
+    inv_cache <<- NULL
+  }
+ 
+  getMatrix <- function() {
+    mat
+  }
+# Create a special "matrix" object
+special_matrix <- makeCacheMatrix()
+ 
+# Set the matrix
+special_matrix$setMatrix(matrix(c(1, 2, 3, 4), 2, 2))
+ 
+# Compute and cache the inverse
+inverse_matrix <- cacheSolve(special_matrix)
+print(inverse_matrix)
+ 
+# Retrieve the cached inverse
+cached_inverse <- cacheSolve(special_matrix)
+print(cached_inverse)
+ 
+  getInverse <- function() {
+    if (is.null(inv_cache)) {
+      inv_cache <<- solve(mat)
+    }
+    inv_cache
+  }
+ 
+  list(setMatrix = setMatrix, getInverse = getInverse)
 }
-
-
-## Write a short comment describing this function
-
+ 
+# This function computes the inverse of the special "matrix" returned by makeCacheMatrix
 cacheSolve <- function(x, ...) {
-        ## Return a matrix that is the inverse of 'x'
+  inv_cache <- x$getInverse()
+  inv_cache
 }