CORS changes
Merge pull request #273 from skrenek/master

CORS changes