diff --git a/cachematrix.R b/cachematrix.R
index a50be65aa44..3119814d0c8 100644
--- a/cachematrix.R
+++ b/cachematrix.R
@@ -4,12 +4,40 @@
 ## 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
+
+  list(set = set,
+       get = get,
+       setInverse = setInverse,
+       getInverse = getInverse)
 }
 
 
 ## Write a short comment describing this function
 
 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)   
+  
+  # Return the inverse
+  inv
 }