diff --git a/scripts/gen_embedded.py b/scripts/gen_embedded.py
index f715b1d..901b014 100755
--- a/scripts/gen_embedded.py
+++ b/scripts/gen_embedded.py
@@ -1,35 +1,83 @@
 #!/usr/bin/env python
 
-import os, os.path, sys
+import os, os.path, sys, argparse
 
-print """
+SOURCE_TEMPLATE = """
 #include "internal/Embedded.h"
 
 #include <string>
 #include <unordered_map>
 
 namespace {
+%s
 
-std::unordered_map<std::string, EmbeddedContent> embedded = {
-"""
-
-for f in sys.argv[1:]:
-	bytes = open(f, 'rb').read()
-	print '{"/%s", {' % os.path.basename(f)
-	print '"' + "".join(['\\x%02x' % ord(x) for x in bytes]) + '"'
-	print ',%d }},' % len(bytes)
-
-print """
-};
+    const std::unordered_map<std::string, EmbeddedContent> embedded = {
+%s
+    };
 
 }  // namespace
 
 const EmbeddedContent* findEmbeddedContent(const std::string& name) {
-	auto found = embedded.find(name);
-	if (found == embedded.end()) {
-		return NULL;
-	}
-	return &found->second;
-}
+    const auto found = embedded.find(name);
+    if (found == embedded.end()) {
+        return nullptr;
+    }
+    return &found->second;
+}\n
 """
 
+MAX_SLICE = 70
+
+
+def as_byte(data):
+    if sys.version_info < (3,):
+        return ord(data)
+    else:
+        return data
+
+
+def parse_arguments():
+    parser = argparse.ArgumentParser(description="Embedded content generator")
+    parser.add_argument('--output', '-o', action='store', dest='output_file', type=str, help='Output File', required=True)
+    parser.add_argument('--file', '-f', action='store', nargs='+', dest='input_file', type=str, help='Output File', required=True)
+    return parser.parse_args()
+
+
+def create_file_byte(name, file_bytes):
+    output = []
+    output.append('    const char %s[] = {' % name)
+
+    for start in range(0, len(file_bytes), MAX_SLICE):
+        output.append('' + "".join(["'\\x%02x'," % as_byte(x) for x in file_bytes[start:start+MAX_SLICE]]) + "\n")
+    output.append('0};\n')
+    return ''.join(output)
+
+
+def create_file_info(file_list):
+    output = []
+    for name, base, length in file_list:
+        output.append('        {"/%s", { %s, %d }},\n' % (base, name, length))
+    return ''.join(output)
+
+
+def main():
+    args = parse_arguments()
+
+    files = []
+    index = 1
+    file_byte_entries = []
+
+    for file_name in args.input_file:
+        with open(file_name, 'rb') as f:
+            file_bytes = f.read()
+        name = "fileData%d" % index
+        index += 1
+        files.append((name, os.path.basename(file_name), len(file_bytes)))
+        file_byte_entries.append(create_file_byte(name, file_bytes))
+
+    with open(args.output_file, 'w') as output_file:
+        output_file.write(SOURCE_TEMPLATE % (''.join(file_byte_entries), create_file_info(files)))
+
+
+if __name__ == '__main__':
+    main()