diff --git a/cachematrix.R b/cachematrix.R
index a50be65aa44..2c7cd88d0b4 100644
--- a/cachematrix.R
+++ b/cachematrix.R
@@ -1,15 +1,49 @@
-## Put comments here that give an overall description of what your
-## functions do
+## This file contains two functions that cache the inverse of a matrix
+## to avoid recomputing the inverse multiple times.
 
-## Write a short comment describing this function
+## This function creates a special matrix object that can store
+## a matrix and cache its inverse.
 
 makeCacheMatrix <- function(x = matrix()) {
+inv <- NULL
+  
+  set <- function(y) {
+    x <<- y
+    inv <<- NULL
+  }
+  
+  get <- function() x
+  
+  setinverse <- function(inverse) {
+    inv <<- inverse
+  }
+  
+  getinverse <- function() inv
+  
+  list(set = set,
+       get = get,
+       setinverse = setinverse,
+       getinverse = getinverse)
 
 }
 
 
-## Write a short comment describing this function
+## This function computes the inverse of the matrix.
+## If the inverse has already been computed, it returns
+## the cached value instead of recomputing it.
 
 cacheSolve <- function(x, ...) {
-        ## Return a matrix that is the inverse of 'x'
+      inv <- x$getinverse()
+  
+  if(!is.null(inv)) {
+    message("getting cached data")
+    return(inv)
+  }
+  
+  data <- x$get()
+  inv <- solve(data)
+  x$setinverse(inv)
+  
+  inv
+
 }