diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # colorless-haskell
 
 This is the Haskell colorless library which includes the server-side runtime.
-It's meant to be used in conjunction with the command line [code generator](github.com/jxv/colorless).
+It's meant to be used in conjunction with the command line [code generator](https://github.com/jxv/colorless).
diff --git a/colorless.cabal b/colorless.cabal
--- a/colorless.cabal
+++ b/colorless.cabal
@@ -3,7 +3,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           colorless
-version:        0.1.0
+version:        1.0.0
 synopsis:       Colorless
 description:    Colorless
 category:       Web
diff --git a/library/Colorless/Runtime/Val.hs b/library/Colorless/Runtime/Val.hs
--- a/library/Colorless/Runtime/Val.hs
+++ b/library/Colorless/Runtime/Val.hs
@@ -160,9 +160,8 @@
     toVal d = Val'Const $ Const'Number $ fromFloatDigits d
 
 instance ToVal a => ToVal (Maybe a) where
-  toVal m = Val'ApiVal $ ApiVal'Enumeral $ case m of
-    Nothing -> Enumeral "None" Nothing
-    Just s -> Enumeral "Some" (Just $ Map.singleton "some" (toVal s))
+  toVal Nothing = Val'Const Const'Null
+  toVal (Just v) = toVal v
 
 instance (ToVal a, ToVal b) => ToVal (Either a b) where
   toVal m = Val'ApiVal $ ApiVal'Enumeral $ case m of
@@ -256,11 +255,8 @@
   fromVal _ = Nothing
 
 instance FromVal a => FromVal (Maybe a) where
-  fromVal (Val'ApiVal (ApiVal'Enumeral (Enumeral tag m))) = case (tag,m) of
-    ("Some",Just m') -> fromVal <$> Map.lookup "some" m'
-    ("None",Nothing) -> Just Nothing
-    _ -> Nothing
-  fromVal _ = Nothing
+  fromVal (Val'Const Const'Null) = Just Nothing
+  fromVal v = Just <$> fromVal v
 
 instance (FromVal a, FromVal b) => FromVal (Either a b) where
   fromVal (Val'ApiVal (ApiVal'Enumeral (Enumeral tag m))) = case (tag,m) of
diff --git a/package.yaml b/package.yaml
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name: colorless
-version: '0.1.0'
+version: '1.0.0'
 category: Web
 synopsis: Colorless
 description: Colorless
diff --git a/tests/ValSpec.hs b/tests/ValSpec.hs
--- a/tests/ValSpec.hs
+++ b/tests/ValSpec.hs
@@ -24,8 +24,8 @@
   describe "parse types from val" $ do
     context "Option" $ do
       it "None" $ shouldBe
-        (fromVal $ Val'ApiVal $ ApiVal'Enumeral $ Enumeral "None" Nothing)
+        (fromVal $ Val'Const Const'Null)
         (Just Nothing :: Maybe (Maybe Bool))
       it "Some" $ shouldBe
-        (fromVal $ Val'ApiVal $ ApiVal'Enumeral $ Enumeral "Some" $ Just $ Map.fromList [("some", Val'Const $ Const'Bool $ True)])
+        (fromVal $ Val'Const $ Const'Bool $ True)
         (Just (Just True) :: Maybe (Maybe Bool))