Merge pull request #80 from davegw/master

Fix bug by updating CORS module
Merge pull request #81 from Plateful/dev

Dev