Added CORS support (second try)