Merge pull request #886 from christriddle/master

Added Access-Control-Allow-Headers for CORS requests