Did some more CORS stuff
Merge pull request #25 from dckesler/master

Did some more CORS stuff