diff --git a/source/app/controllers/util.py b/source/app/controllers/util.py
index 0c1af30..597b3f2 100644
--- a/source/app/controllers/util.py
+++ b/source/app/controllers/util.py
@@ -331,8 +331,18 @@ class Certificado(object):
         result = _call(args.format(self._path_cer, 'serial'))
         serie = result.split('=')[1].split('\n')[0][1::2]
         result = _call(args.format(self._path_cer, 'subject'))
-        #~ rfc = result.split('=')[5].split('/')[0].strip()
-        rfc = result.split('x500UniqueIdentifier = ')[1][:13].strip()
+        #~ Verificar si es por la version de OpenSSL
+        t1 = 'x500UniqueIdentifier = '
+        t2 = 'x500UniqueIdentifier='
+        if t1 in result:
+            rfc = result.split(t1)[1][:13].strip()
+        elif t2 in result:
+            rfc = result.split(t2)[1][:13].strip()
+        else:
+            self.error = 'No se pudo obtener el RFC del certificado'
+            print ('\n', result)
+            return data
+
 
         if not DEBUG:
             if not rfc == session_rfc:
diff --git a/source/app/models/main.py b/source/app/models/main.py
index 922126c..9e81d2c 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -268,6 +268,9 @@ class Emisor(BaseModel):
         fields['nombre'] = fields.pop('emisor_nombre')
         fields['codigo_postal'] = fields.pop('emisor_cp')
         fields['cp_expedicion'] = fields.pop('emisor_cp2', '') or fields['codigo_postal']
+        fields['calle'] = fields.pop('emisor_calle', '')
+        fields['no_exterior'] = fields.pop('emisor_no_exterior', '')
+        fields['no_interior'] = fields.pop('emisor_no_interior', '')
         fields['colonia'] = fields.pop('emisor_colonia', '')
         fields['municipio'] = fields.pop('emisor_municipio', '')
         fields['estado'] = fields.pop('emisor_estado', '')
diff --git a/source/app/settings.py b/source/app/settings.py
index a69cd1f..bc7eade 100644
--- a/source/app/settings.py
+++ b/source/app/settings.py
@@ -11,7 +11,7 @@ from conf import DEBUG, LOG_PATH
 
 
 DEBUG = DEBUG
-VERSION = '0.2.0'
+VERSION = '0.2.1'
 EMAIL_SUPPORT = ('soporte@empresalibre.net',)
 
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))