Add CORS proxy
Clean code
Merge commit '77343fbdd89db28ed516d6d7d099ad3dfe4b1116'