diff --git a/cachematrix.R b/cachematrix.R
index a50be65aa44..2c956028500 100644
--- a/cachematrix.R
+++ b/cachematrix.R
@@ -1,15 +1,31 @@
-## Put comments here that give an overall description of what your
-## functions do
-
-## Write a short comment describing this function
-
 makeCacheMatrix <- function(x = matrix()) {
+        inv <- NULL
 
-}
+        set <- function(y) {
+                x <<- y
+                inv <<- NULL
+                }
+        get <- function() x
 
+        setinverse <- function(inverse) inv <<- inverse
+        getinverse <- function() inv
 
-## Write a short comment describing this function
+        list(set = set,
+             get = get,
+             setinverse = setinverse,
+             getinverse = getinverse)
+        }
 
 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
+        }
+