diff --git a/zip-folder.php b/zip-folder.php
index 9fc5134..35792d4 100644
--- a/zip-folder.php
+++ b/zip-folder.php
@@ -6,35 +6,44 @@
 
 class GoodZipArchive extends ZipArchive 
 {
-	//@author Nicolas Heimann
-	public function __construct($a=false, $b=false) { $this->create_func($a, $b);  }
-	
-	public function create_func($input_folder=false, $output_zip_file=false)
-	{
-		if($input_folder !== false && $output_zip_file !== false)
-		{
-			$res = $this->open($output_zip_file, ZipArchive::CREATE);
-			if($res === TRUE) 	{ $this->addDir($input_folder, basename($input_folder)); $this->close(); }
-			else  				{ echo 'Could not create a zip archive. Contact Admin.'; }
-		}
-	}
-	
+    //@author Nicolas Heimann
+    public function __construct($a = false, $b = false)
+    {
+        $this->create_func($a, $b);
+    }
+
+    public function create_func($input_folder = false, $output_zip_file = false)
+    {
+        if ($input_folder !== false && $output_zip_file !== false) {
+            $res = $this->open($output_zip_file, ZipArchive::CREATE);
+            if ($res === TRUE) {
+                $this->addDir($input_folder);
+                $this->close();
+            } else {
+                echo 'Could not create a zip archive. Contact Admin.';
+            }
+        }
+    }
+
     // Add a Dir with Files and Subdirs to the archive
-    public function addDir($location, $name) {
-        $this->addEmptyDir($name);
-        $this->addDirDo($location, $name);
+    public function addDir($location, $name = '')
+    {
+        if (!empty($name)) $this->addEmptyDir($name);
+        $this->addDirTo($location, $name);
     }
 
     // Add Files & Dirs to archive 
-    private function addDirDo($location, $name) {
-        $name .= '/';         $location .= '/';
-      // Read all Files in Dir
-        $dir = opendir ($location);
-        while ($file = readdir($dir))    {
+    private function addDirTo($location, $name)
+    {
+        if (!empty($name)) $name .= '/';
+        $location .= '/';
+        // Read all Files in Dir
+        $dir = opendir($location);
+        while ($file = readdir($dir)) {
             if ($file == '.' || $file == '..') continue;
-          // Rekursiv, If dir: GoodZipArchive::addDir(), else ::File();
-            $do = (filetype( $location . $file) == 'dir') ? 'addDir' : 'addFile';
+            // Rekursiv, If dir: GoodZipArchive::addDir(), else ::File();
+            $do = (filetype($location . $file) == 'dir') ? 'addDir' : 'addFile';
             $this->$do($location . $file, $name . $file);
         }
-    } 
+    }
 }