Improved support for CORS
Merge pull request #211 from thiago-negri/master

Improved support for CORS