Adding CORS suport
Merge remote-tracking branch 'origin/master'