diff --git a/README.md b/README.md
index 724e1c2..08db88d 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ Requirements
 Usage
 -----
 
-To convert a single CBR file use this (the script can't handle filenames with spaces):
+To convert a single CBR file use this:
 
-``./cbr2cbz.py <cbr_filename_without_spaces>``
+``./cbr2cbz.py <cbr_filename>``
 
 To convert an entire directory with CBR files in it use:
 
diff --git a/cbr2cbz.py b/cbr2cbz.py
index fa76f1b..ffb4b7e 100755
--- a/cbr2cbz.py
+++ b/cbr2cbz.py
@@ -28,7 +28,7 @@ def uncompress(filename, directory):
 def compress (directory, zip_filename):
     ZIP="zip"
     directory=directory+"/*"
-    command=" ".join([ZIP, zip_filename, directory ])
+    command=" ".join([ZIP, "\""+zip_filename+"\"", directory ])
     execute (command)
 
 def get_filename_without_extension(filename):
@@ -54,8 +54,7 @@ uncompress(sys.argv[1], temp_dir)
 
 #Compress images and put them into a CBZ/ZIP
 compress(temp_dir, cbz_filename)
-
-
+execute("".join(["rm -Rf ", temp_dir]))
 
 
 
diff --git a/cbrfolder2cbz.py b/cbrfolder2cbz.py
index 5fbe81d..f36be92 100755
--- a/cbrfolder2cbz.py
+++ b/cbrfolder2cbz.py
@@ -13,25 +13,26 @@ def print_err(message):
     
 def print_usage():
     usage="cbr2cbz A script utility to convert a directory with CBR files into CBZ files"
-    usage+="\n\t Usage: cbr2cbz <directory>"
+    usage+="\n\t Usage: cbr2cbz <directory> [<directory> <directory> ...]"
     usage+="\n\t\n\t (Please don't use non-free formats like RAR/CBR)"
     print_err(usage)
 
 def convert(filename):
     CONVERT="./cbr2cbz.py"
-    command=" ".join([CONVERT, filename])
+    command=" ".join([CONVERT, "\""+filename+"\""])
     execute(command)
 
-if len(sys.argv)!=2:
+if len(sys.argv)<2:
     print_usage();
     sys.exit(-1)
 
 
+sys.argv.pop(0)
 
-
-directory=os.path.abspath(sys.argv[1])
-
-for f in os.listdir(directory):
-    filename_with_path=os.path.join(directory, f)
-    print(filename_with_path)
-    convert(filename_with_path)
\ No newline at end of file
+for dir in sys.argv:
+    print dir
+    directory=os.path.abspath(dir)
+    for f in os.listdir(directory):
+        filename_with_path=os.path.join(directory, f)
+        print(filename_with_path)
+        convert(filename_with_path)