Merge branch 'master' into gui_options

Conflicts:
	mat-gui

1 files changed, 5 insertions, 2 deletions

diff --git a/MAT/mat.py b/MAT/mat.py
index 4c12333..84f26f2 100644
--- a/MAT/mat.py
+++ b/MAT/mat.py
@@ -102,7 +102,7 @@ def secure_remove(filename):
             logging.error('Unable to remove %s' % filename)
 
 
-def create_class_file(name, backup, add2archive):
+def create_class_file(name, backup, **kwargs):
     '''
         return a $FILETYPEStripper() class,
         corresponding to the filetype of the given file
@@ -149,4 +149,7 @@ def create_class_file(name, backup, add2archive):
         logging.info('Don\'t have stripper for %s format' % mime)
         return None
 
-    return stripper_class(filename, parser, mime, backup, add2archive)
+    if mime.endswith('pdf') and mime.startswith('application/'):
+        return stripper_class(filename, parser, mime, backup, **kwargs)
+
+    return stripper_class(filename, parser, mime, backup, **kwargs)