#2 Added CORS support