CORS
Merge remote-tracking branch 'upstream/master'
Merge pull request #31 from kadu/master

CORS