diff --git a/genstrings_merge.py b/genstrings_merge.py
old mode 100644
new mode 100755
index 0217c9f..cc7cf5a
--- a/genstrings_merge.py
+++ b/genstrings_merge.py
@@ -8,7 +8,7 @@
 OUTPUT_ENCODING = 'utf-16'
 OUTPUT_LINE_PATTERN = u'/* {comment} */\n"{key}" = "{value}";\n\n'
 
-pattern = re.compile('/\* ([^"]*) \*/\s"([^"]*)" = "([^"]*)";')
+pattern = re.compile(r'/\* ([^"]*) \*/\s"([^"]*)" = "((?:\\.|[^"\\])*)";')
 String = namedtuple('String', ['key', 'value', 'comment'])
 
 
diff --git a/genstrings_swift.py b/genstrings_swift.py
old mode 100644
new mode 100755
index 9d6767d..2ae1a8b
--- a/genstrings_swift.py
+++ b/genstrings_swift.py
@@ -22,7 +22,7 @@
 def read_cmd():
     parser = argparse.ArgumentParser()
     parser.add_argument('-o', '--output', help='Command output directory', default='.')
-    parser.add_argument('filepath', help='file to generate strings from')
+    parser.add_argument('filepaths', help='file(s) to generate strings from', type=argparse.FileType('r'), nargs='+')
     args = parser.parse_args()
     return args
 
@@ -62,14 +62,15 @@ def generate_string(params):
     return String(key, value, comment)
 
 
-def grep_file(filepath):
+def grep_file(filepaths):
     strings = []
-    with io.open(filepath, encoding='utf-8') as fp:
-        content = fp.read()
-        for match in string_pattern.finditer(content):
-            params = match.group(1)
-            string = generate_string(params)
-            strings.append(string)
+    for filepath in filepaths:
+        with io.open(filepath.name, encoding='utf-8') as fp:
+			content = fp.read()
+			for match in string_pattern.finditer(content):
+				params = match.group(1)
+				string = generate_string(params)
+				strings.append(string)
     return strings
 
 
@@ -82,7 +83,7 @@ def save_strings(output_dir, strings):
 
 def main():
     args = read_cmd()
-    strings = grep_file(args.filepath)
+    strings = grep_file(args.filepaths)
     save_strings(args.output, strings)