Merge branch 'develop'
Remvoe debug output
Fix typos in comments
Merge branch 'master' into develop
Enable CORS