issue #216 - Follow CORS steps