diff --git a/README.md b/README.md
index 9f362c6..1e8539b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ http://blog.cylance.com/you-me-and-.net-guids
 
 ```
 $ getnetguids -h
-usage: getnetguids [-h] [-v] [-r] [path [path ...]]
+usage: getnetguids [-h] [-v] [-r] [-c] [path [path ...]]
 
 Extracts Typelib IDs and MVIDs from .NET assemblies.
 
@@ -19,7 +19,8 @@ optional arguments:
   -h, --help       show this help message and exit
   -v, --version    show program's version number and exit
   -r, --recursive  Scan paths recursively
+  -c, --csv        Save to CSV
 
-getnetguids v1.3.0 by Brian Wallace (@botnet_hunter)
+getnetguids v1.4.2 by Brian Wallace (@botnet_hunter)
 
-```
\ No newline at end of file
+```
diff --git a/getnetguids.py b/getnetguids.py
index 769b124..b989aac 100644
--- a/getnetguids.py
+++ b/getnetguids.py
@@ -2,6 +2,9 @@
 import pefile
 import struct
 import re
+import datetime
+import csv
+import hashlib
 
 guid_regex = re.compile("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}")
 
@@ -36,18 +39,49 @@ def get_assembly_guids(assembly_path):
     try:
         try:
             pe = pefile.PE(assembly_path)
+
+            txt_start = None
+            txt_end = None
+            for section in pe.sections:
+                if section.Name.startswith(".text\x00"):
+                    txt_start = section.PointerToRawData
+                    txt_end = txt_start + section.SizeOfRawData
         except pefile.PEFormatError:
             return None
         if not is_dot_net_assembly(pe):
             return None
+            
+        #Compile TimeDateStamp
+        try:
+            compiled = get_compiletime(pe)
+        except Exception:
+            compiled = "Error"
 
         # Removed strict parsing and opted for simple searching method to support malformed assemblies
         with open(assembly_path, "rb") as assembly_file_handler:
             file_data = assembly_file_handler.read()
-        for i in [file_data[l.start():] for l in re.finditer("\x42\x53\x4a\x42", file_data)]:
+
+        text_section = file_data[txt_start:][:txt_end]
+
+
+        mdo = pe.get_offset_from_rva(struct.unpack("<IHHI", text_section[8:][:12])[-1])
+
+        if mdo < txt_start:
+            offsets_to_test = [mdo]
+        else:
+            offsets_to_test = [mdo - txt_start]
+
+        offsets_to_test.extend([l.start() for l in re.finditer("\x42\x53\x4a\x42", text_section)][::-1])
+
+        del file_data
+
+        for i_offset in offsets_to_test:
+            i = text_section[i_offset:]
             try:
                 if "\x42\x53\x4a\x42" not in i:
                     continue
+                if not i.startswith("\x42\x53\x4a\x42"):
+                    continue
                 meta_data_offset = i.find("\x42\x53\x4a\x42")
                 clr_version_length = struct.unpack("<I", i[meta_data_offset + 12:meta_data_offset + 16])[0]
                 try:
@@ -88,6 +122,39 @@ def get_assembly_guids(assembly_path):
                     guid_heap_index_length = 2 if ord(tilde[6:7]) & 0x02 == 0x00 else 4
                     blob_heap_index_length = 2 if ord(tilde[6:7]) & 0x04 == 0x00 else 4
 
+                    # print "Reserved 0x01: {0}".format([tilde[7:8]])
+                    # print "Table list: {0}".format([tilde[8:16]])
+
+                    tables_present = [x == "1" for x in bin(struct.unpack("<Q", tilde[8:16])[0])[2:][::-1]]
+                    # tables_present_count = len([a for a in tables_present if a])
+                    # print "Tables present count: {0}".format(tables_present_count)
+
+                    # print "Which tables are sorted list: {0}".format([tilde[16:24]])
+
+                    row_counts = [0] * 64
+                    t_offset = 24
+                    for index in xrange(len(tables_present)):
+                        if index < len(tables_present) and tables_present[index]:
+                            row_counts[index] = struct.unpack("<I", tilde[t_offset:t_offset + 4])[0]
+                            t_offset += 4
+
+                    has_custom_attribute_tables = [
+                        0x06, 0x04, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x00,
+                        0x0E, # Permission aka DeclSecurity (typo in the spec)
+                        0x17, 0x14, 0x11, 0x1A, 0x1B, 0x20, 0x23, 0x26,
+                        0x27, 0x2A, 0x2C, 0x2B
+                    ]
+                    custom_attribute_type_tables = [0x06, 0x0A]
+                    resolution_scope_tables = [0x00, 0x1A, 0x23, 0x01]
+                    type_def_or_ref_tables = [0x02, 0x01, 0x1B]
+                    member_ref_tables = [0x02, 0x01, 0x1A, 0x06, 0x1B]
+
+                    big_has_custom_attribute = any([row_counts[x] >= 2**(16 - 5) for x in has_custom_attribute_tables])
+                    big_custom_attribute_type = any([row_counts[x] >= 2**(16 - 3) for x in custom_attribute_type_tables])
+                    big_resolution_scope = any([row_counts[x] >= 2**(16 - 2) for x in resolution_scope_tables])
+                    big_type_def_or_ref = any([row_counts[x] >= 2**(16 - 2) for x in type_def_or_ref_tables])
+                    big_member_ref_parent = any([row_counts[x] >= 2**(16 - 3) for x in member_ref_tables])
+
                     # Build row length for each type up to CustomAttr
                     row_type_widths = [
                         # 0x00 Module = Generation (2 bytes) + Name (String heap index) + Mvid (Guid heap index) +
@@ -96,11 +163,11 @@ def get_assembly_guids(assembly_path):
 
                         # 0x01 TypeRef = ResolutionScope (ResolutionScope index) + TypeName (String heap) +
                         # TypeNamespace (String heap)
-                        2 + (strings_heap_index_length * 2),
+                        (4 if big_resolution_scope else 2) + (strings_heap_index_length * 2),
                         # 0x02 TypeDef = Flags(2 bytes) + TypeName(String heap index) +TypeNamespace(String heap index)+
                         # Extends (TypeDefOrRef index) + FieldList (index into field table) +
                         # MethodList (index into MethodDef table) + ?
-                        10 + (strings_heap_index_length * 2),
+                        8 + (4 if big_type_def_or_ref else 2) + (strings_heap_index_length * 2),
                         0,  # 0x03 None
                         # 0x04 Field = Flags (2 bytes) + Name (String heap index) + Signature (Blob heap index)
                         2 + strings_heap_index_length + blob_heap_index_length,
@@ -112,48 +179,62 @@ def get_assembly_guids(assembly_path):
                         # 0x08 Param = Flags (2 bytes) + Sequence (2 bytes) + Name (String heap index)
                         4 + strings_heap_index_length,
                         # 0x09 InterfaceImpl = Class (TypeDef index) + Interface (TypeDefOrRef index)
-                        4,
+                        2 + (4 if big_type_def_or_ref else 2),
                         # 0x0a MemberRef = Class(MemberRefParent) + Name(String heap index) + Signature(Blob heap index)
-                        2 + strings_heap_index_length + blob_heap_index_length,
+                        (4 if big_member_ref_parent else 2) + strings_heap_index_length + blob_heap_index_length,
                         # 0x0b Constant = Type (?) + Parent + Value (Blob heap index)
                         4 + blob_heap_index_length,
                         # 0x0c CustomAttr = Parent + Type (CustomAttributeType) + Value (Blob heap index)
-                        4 + blob_heap_index_length,
+                        (4 if big_has_custom_attribute else 2) + (4 if big_custom_attribute_type else 2) + blob_heap_index_length,
                         # Don't care about the rest
                     ]
 
-                    # print "Reserved 0x01: {0}".format([tilde[7:8]])
-                    # print "Table list: {0}".format([tilde[8:16]])
-
-                    tables_present = [x == "1" for x in bin(struct.unpack("<Q", tilde[8:16])[0])[2:][::-1]]
-                    # tables_present_count = len([a for a in tables_present if a])
-                    # print "Tables present count: {0}".format(tables_present_count)
-
-                    # print "Which tables are sorted list: {0}".format([tilde[16:24]])
-
-                    row_counts = [0] * len(tables_present)
-                    t_offset = 24
-                    for index in xrange(len(tables_present)):
-                        if tables_present[index]:
-                            row_counts[index] = struct.unpack("<I", tilde[t_offset:t_offset + 4])[0]
-                            t_offset += 4
-
                     for index in xrange(0x0c):
                         t_offset += row_type_widths[index] * row_counts[index]
 
                     for index in xrange(row_counts[0x0c]):
-                        # parent_index = struct.unpack("<H", tilde[t_offset:t_offset + 2])[0]
-                        # type_index = struct.unpack("<H", tilde[t_offset + 2:t_offset + 4])[0]
-                        if blob_heap_index_length == 2:
-                            blob_index = struct.unpack("<H", tilde[t_offset + 4:t_offset + 6])[0]
-                            data_value = read_blob(heaps["#Blob"][blob_index:])
+                        # In the most strict interpretation, a typelib id is expressed as a
+                        # GuidAttribute on the current assembly.
+                        # To check that it's actually a GuidAttribute we'd have to support parsing
+                        # .NET signatures, so it's safer to assume a MemberRef attribute owned by a
+                        # TypeRef on an AssemblyRow with a value matching a guid is PROBABLY the typelib id
+
+                        row_offset = t_offset
+
+                        if big_has_custom_attribute:
+                            parent_index = struct.unpack("<I", tilde[row_offset:row_offset + 4])[0]
+                            row_offset += 4
+                        else:
+                            parent_index = struct.unpack("<H", tilde[row_offset:row_offset + 2])[0]
+                            row_offset += 2
+
+                        if big_custom_attribute_type:
+                            type_index = struct.unpack("<I", tilde[row_offset:row_offset + 4])[0]
+                            row_offset += 4
                         else:
-                            blob_index = struct.unpack("<I", tilde[t_offset + 4:t_offset + 8])[0]
+                            type_index = struct.unpack("<H", tilde[row_offset:row_offset + 2])[0]
+                            row_offset += 2
+
+                        parent_index_table = parent_index & 0x1f
+                        type_index_table = type_index & 0x07
+
+                        # We only really care if the parent is an Assembly and the attribute is constructed
+                        # using a MemberRef. MemberRef because a MethodDef is never going to be used for a
+                        # GuidAttribute. This is because GuidAttribute is from mscorlib, so always an external
+                        # assembly, so always reached via TypeRef/MemberRef.
+                        if parent_index_table == 0x0e and type_index_table == 0x03:
+                            if blob_heap_index_length == 2:
+                                blob_index = struct.unpack("<H", tilde[row_offset:row_offset + 2])[0]
+                                row_offset += 2
+                            else:
+                                blob_index = struct.unpack("<I", tilde[row_offset:row_offset + 4])[0]
+                                row_offset += 4
+
                             data_value = read_blob(heaps["#Blob"][blob_index:])
-                        if guid_regex.match(data_value):
-                            return {"mvid": extracted_mvid.lower(), "typelib_id": data_value.lower()}
+                            if guid_regex.match(data_value):
+                                return {"mvid": extracted_mvid.lower(), "typelib_id": data_value.lower(), "compiled": compiled}
                         t_offset += row_type_widths[0x0c]
-                return {"mvid": extracted_mvid.lower()}
+                    return {"mvid": extracted_mvid.lower(), "compiled": compiled}
             except KeyboardInterrupt:
                 raise
             except:
@@ -168,7 +249,7 @@ def get_assembly_guids(assembly_path):
 if __name__ == "__main__":
     from argparse import ArgumentParser
 
-    version = "1.3.0"
+    version = "1.4.2"
 
     parser = ArgumentParser(
         prog=__file__,
@@ -180,6 +261,8 @@ def get_assembly_guids(assembly_path):
                         help="Paths to files or directories to scan")
     parser.add_argument('-r', '--recursive', default=False, required=False, action='store_true',
                         help="Scan paths recursively")
+    parser.add_argument('-c', '--csv', default=False, required=False, action='store_true',
+                        help="Save to CSV")
 
     args = parser.parse_args()
 
@@ -204,22 +287,40 @@ def scan_paths(paths, recursive):
                         paths.append(p)
                     if isfile(p):
                         yield p, get_assembly_guids(p)
-
-    import hashlib
+    def get_compiletime(pe):
+        return datetime.datetime.fromtimestamp(pe.FILE_HEADER.TimeDateStamp)
+        
+    if args.csv:
+        theCSV = open('out.csv', 'wt')
+        writer=csv.writer(theCSV)
+        writer.writerow(('TYPELIB', 'MVID', 'HASH', 'COMPILED', 'PATH'))
+    else:
+        print "{0}\t\t\t\t\t{1}\t\t\t\t\t{2}\t\t\t\t\t{3}\t\t{4}".format('TYPELIB', 'MVID', 'HASH', 'COMPILED', 'PATH')
+    
     for file_path, result in scan_paths(args.path, args.recursive):
         if result is None:
             continue
         try:
             typelib_id = result["typelib_id"]
         except KeyError:
-            typelib_id = "None"
+            typelib_id = "None\t\t\t\t"
         try:
             mvid = result["mvid"]
         except KeyError:
             # Potentially should log these results as they should at least have an MVID
             continue
-
+        try:
+            compiled = result["compiled"]
+        except KeyError:
+            compiled = "None\t\t\t\t\t"
+            
         with open(file_path, 'rb') as f:
             s = hashlib.sha256(f.read()).hexdigest()
-
-        print "{0}\t{1}\t{2}\t{3}".format(typelib_id, mvid, s, file_path)
\ No newline at end of file
+            
+        if args.csv:
+            writer.writerow((typelib_id, mvid, s, compiled, file_path))
+        else:
+            print "{0}\t{1}\t{2}\t{3}\t{4}".format(typelib_id, mvid, s, compiled, file_path)
+            
+    if args.csv:        
+        theCSV.close()
diff --git a/setup.py b/setup.py
index 9aca9d3..31e8467 100644
--- a/setup.py
+++ b/setup.py
@@ -3,11 +3,11 @@
 from distutils.core import setup
 
 setup(name='getnetguids',
-      version='1.3.0',
+      version='1.4.2',
       description='Extracts Typelib IDs and MVIDs from .NET assemblies.',
       author='Brian Wallace',
       url='https://github.com/bwall/getnetguids',
       py_modules=['getnetguids'],
       scripts=['getnetguids.py'],
       install_requires=['pefile', 'argparse'],
-     )
\ No newline at end of file
+     )