diff --git a/cachematrix.R b/cachematrix.R
index a50be65aa44..86759d9ca2a 100644
--- a/cachematrix.R
+++ b/cachematrix.R
@@ -4,12 +4,30 @@
 ## Write a short comment describing this function
 
 makeCacheMatrix <- function(x = matrix()) {
-
+  inv <- NULL
+  set <- function(y) {
+    x <<- y
+    inv <<- NULL
+  }
+  get <- function() x
+  setinv <- function(i) inv <<- i
+  getinv <- function() inv
+  list(set = set, get = get,
+       getinv = getinv,
+       setinv = setinv)
 }
 
-
 ## Write a short comment describing this function
 
 cacheSolve <- function(x, ...) {
-        ## Return a matrix that is the inverse of 'x'
+  inv <- x$getinv()
+  if(!is.null(inv)) {
+    message("getting cached data")
+    return(inv)
+  } else {
+    data <- x$get()
+    inv <- solve(data, ...)
+    x$setinv(inv)
+  }
+  inv
 }