Fix for cross-origin access problem
Merge branch 'develop'