Expand makeCacheMatrix and cacheSolve