Added cross origin fix.
Merge branch 'feat/cross-origin' into development