Merge pull request #2 from juankbrera/development

add header for cors work
Merge branch 'master' into development