Added support for CORS #20