Merge pull request #23 from brianjmiller/master

Improve CORS handling