diff --git a/linkero/config/config-scheme.json b/linkero/config/config-scheme.json
index b6f54a8..c5db831 100644
--- a/linkero/config/config-scheme.json
+++ b/linkero/config/config-scheme.json
@@ -18,6 +18,10 @@
         "certificate" : "ssl/cert_file.crt",
         "key" : "ssl/key_file.key"
     },
+    "CORS" : {
+        "enable" : true,
+        "origins" : "*"
+    },
     "gevent" : {
         "spawn" : 10000
     },
diff --git a/linkero/config/config.json b/linkero/config/config.json
index 317c2d0..da73ae3 100644
--- a/linkero/config/config.json
+++ b/linkero/config/config.json
@@ -17,6 +17,10 @@
        	"activate" : false,
        	"certificate" : "ssl/cert_file.crt",
        	"key" : "ssl/key_file.key"
+    },
+    "CORS" : {
+        "enable" : true,
+        "origins" : "*"
     },
 	"gevent" : {
        	"spawn" : 10000
diff --git a/linkero/core/common.py b/linkero/core/common.py
index a29ef5d..8236715 100644
--- a/linkero/core/common.py
+++ b/linkero/core/common.py
@@ -10,7 +10,7 @@
 
 class Metadata:
     def __init__(self):
-        self.__version__ = '0.9.2'
+        self.__version__ = '0.9.3'
         self.__author__ = 'Rubén de Celis Hernández'
 
     def get_version(self):
diff --git a/linkero/core/linkero.py b/linkero/core/linkero.py
index 094044a..b41fc1d 100644
--- a/linkero/core/linkero.py
+++ b/linkero/core/linkero.py
@@ -5,6 +5,7 @@
 from flask_restful import reqparse, abort, Api, Resource, fields, marshal
 from flask_sqlalchemy import SQLAlchemy
 from flask_httpauth import HTTPBasicAuth
+from flask_cors import CORS
 from passlib.apps import custom_app_context as pwd_context
 from itsdangerous import (TimedJSONWebSignatureSerializer
                           as Serializer, BadSignature, SignatureExpired)
@@ -33,6 +34,8 @@
     tokenLife = config["tokenLife"]  # In seconds
     adminSecret = config["adminSecret"]
     checkDefaultAdminSecret(adminSecret)
+    cors = config["CORS"]["enable"]
+    origins = config["CORS"]["origins"]
     debug = config["debug"]
 except KeyError:
     print(bcolors.WARNING+"Misformed config.json!"+bcolors.ENDC)
@@ -42,6 +45,8 @@
 db = SQLAlchemy(app)
 auth = HTTPBasicAuth()
 api = Api(app)
+if cors:
+    CORS(app, origins=origins)
 
 
 class User(db.Model):
diff --git a/requirements.txt b/requirements.txt
index 4af759d..197fd95 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
 flask-restful==0.3.5
 flask-sqlalchemy==2.1
 flask-httpauth==3.1.2
+flask-cors==3.0.3
 passlib==1.6.5
 itsdangerous==0.24
 gevent>=1.2.1