CORS stuff
Merge pull request #43 from dckesler/master

CORS stuff