Merge branch 'master' into gui_options

Conflicts:
	mat-gui

1 files changed, 2 insertions, 3 deletions

diff --git a/MAT/exiftool.py b/MAT/exiftool.py
index 758a094..eeefcb8 100644
--- a/MAT/exiftool.py
+++ b/MAT/exiftool.py
@@ -11,9 +11,8 @@ class ExiftoolStripper(parser.GenericParser):
         A generic stripper class using exiftool as backend
     '''
 
-    def __init__(self, filename, parser, mime, backup, add2archive):
-        super(ExiftoolStripper, self).__init__(filename, parser, mime,
-        backup, add2archive)
+    def __init__(self, filename, parser, mime, backup, **kwargs):
+        super(ExiftoolStripper, self).__init__(filename, parser, mime, backup, **kwargs)
         self.allowed = ['ExifTool Version Number', 'File Name', 'Directory',
                 'File Size', 'File Modification Date/Time', 'File Permissions',
                 'File Type', 'MIME Type', 'Image Width', 'Image Height',