diff --git a/include/atomizes.hpp b/include/atomizes.hpp
index 1a6a716..f2d8c41 100644
--- a/include/atomizes.hpp
+++ b/include/atomizes.hpp
@@ -64,7 +64,8 @@ namespace atomizes
         DELETE,
         CONNECT,
         TRACE,
-        PATCH
+        PATCH,
+        OPTIONS
     };
 
     /**
@@ -74,8 +75,6 @@ namespace atomizes
     {
         switch (method)
         {
-        case MessageMethod::NONE:
-            return "NONE";
         case MessageMethod::GET:
             return "GET";
         case MessageMethod::HEAD:
@@ -92,6 +91,11 @@ namespace atomizes
             return "TRACE";
         case MessageMethod::PATCH:
             return "PATCH";
+        case MessageMethod::OPTIONS:
+            return "OPTIONS";
+        case MessageMethod::NONE:
+        default:
+            return "NONE";
         }
     }
 
@@ -118,6 +122,8 @@ namespace atomizes
             return MessageMethod::TRACE;
         if (method == "PATCH")
             return MessageMethod::PATCH;
+        if (method == "OPTIONS")
+            return MessageMethod::OPTIONS;
 
         return MessageMethod::NONE;
     }