diff --git a/cachematrix.R b/cachematrix.R
index a50be65aa44..51f1a7298e7 100644
--- a/cachematrix.R
+++ b/cachematrix.R
@@ -1,15 +1,46 @@
 ## Put comments here that give an overall description of what your
 ## functions do
 
+## This library is creates a matrix that can cache it's inverse
+## and gives computes the inverse of the created matrix
+
 ## Write a short comment describing this function
 
-makeCacheMatrix <- function(x = matrix()) {
+## makeCacheMatrix: This function creates a special "matrix" object that can cache its inverse.
 
+makeCacheMatrix <- function(x = matrix()) {
+  m <- NULL
+  set <- function(y) {
+    x <<- y
+    m <<- NULL
+  }
+  get <- function() x
+  ## Set and cache the inverse of the matrix using the solve function
+  setinverse <- function(solve) m <<- inverse
+  getinverse <- function() m
+  ## Create a list containing a function to set the value of the matrix, get the value of the matrix,
+  ## set the value of the inverse, and get the value of the inverse.
+  list(set=set, get=get, setinverse=setinverse, getinverse=getinverse)
+  
 }
 
 
 ## Write a short comment describing this function
+## cacheSolve: This function computes the inverse of the special "matrix" returned by makeCacheMatrix above. 
+## If the inverse has already been calculated (and the matrix has not changed), then the cachesolve should 
+## retrieve the inverse from the cache.
 
 cacheSolve <- function(x, ...) {
-        ## Return a matrix that is the inverse of 'x'
+  m <- x$getinverse()
+  ## check to see if there is already a cached inverse
+  if(!is.null(m)) {
+    message("getting cached data")
+    return(m)
+  }
+  
+  ## If there is no cached inverse calculate the inverse, cache it and return it
+  data <- x$get()
+  m <- solve(data, ...)
+  x$setinverse(m)
+  m
 }