fixed CORS issues
friendly message for #135
Merge remote-tracking branch 'upstream/master'