diff --git a/CHANGES.md b/CHANGES.md
index 0d5c6c6..41b6f20 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,8 @@
-### Apache MetaModel Membrane 0.1 [work in progress]
+### Apache MetaModel Membrane [work in progress]
+
+* [METAMODEL-1212] - Added support for CORS headers.
+
+### Apache MetaModel Membrane 0.1
 
 * [METAMODEL-1153] - Added endpoints for deleting data sources.
 * [METAMODEL-1147] - Implemented Swagger codegen to build model classes from swagger file.
diff --git a/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java b/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
index 4ec6054..03a0dce 100644
--- a/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
+++ b/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
@@ -88,12 +88,11 @@
         final DeploymentManager manager = Servlets.defaultContainer().addDeployment(deployment);
         manager.deploy();
 
-        HttpHandler handler;
+        final HttpHandler handler;
         if (enableCors) {
             CorsHandlers corsHandlers = new CorsHandlers();
             handler = corsHandlers.allowOrigin(manager.start());
-        }
-        else {
+        } else {
             handler = manager.start();
         }