Merge pull request #14 from alejandronanez/development

Development
Enabling CORS
Merge pull request #16 from alejandronanez/cors

Enabling CORS
Closes #15
Merge pull request #17 from alejandronanez/master

Updates.