diff --git a/mz_zip.c b/mz_zip.c
index c37d6c4..cfe12ac 100644
--- a/mz_zip.c
+++ b/mz_zip.c
@@ -614,6 +614,9 @@ int32_t mz_zip_close(void *handle)
     if (zip->comment)
         MZ_FREE(zip->comment);
 
+    zip->stream = NULL;
+    zip->cd_stream = NULL;
+
     return err;
 }
 
@@ -660,6 +663,17 @@ int32_t mz_zip_set_version_madeby(void *handle, uint16_t version_madeby)
     return MZ_OK;
 }
 
+int32_t mz_zip_get_stream(void *handle, void **stream)
+{
+    mz_zip *zip = (mz_zip *)handle;
+    if (zip == NULL || stream == NULL)
+        return MZ_PARAM_ERROR;
+    *stream = zip->stream;
+    if (*stream == NULL)
+        return MZ_EXIST_ERROR;
+    return MZ_OK;
+}
+
 // Get info about the current file in the zip file
 static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file *file_info, void *file_info_stream)
 {
diff --git a/mz_zip.h b/mz_zip.h
index 2c559ac..84a25dd 100644
--- a/mz_zip.h
+++ b/mz_zip.h
@@ -89,6 +89,9 @@ int32_t mz_zip_get_version_madeby(void *handle, uint16_t *version_madeby);
 int32_t mz_zip_set_version_madeby(void *handle, uint16_t version_madeby);
 // Set the version made by used for writing zip file
 
+int32_t mz_zip_get_stream(void *handle, void **stream);
+// Get a pointer to the stream used to open
+
 /***************************************************************************/
 
 int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_info,