Merge pull request #79 from Plateful/dev

Dev
Update cors module
Merge pull request #80 from davegw/master

Fix bug by updating CORS module