diff --git a/example/greet.hs b/example/greet.hs
--- a/example/greet.hs
+++ b/example/greet.hs
@@ -7,13 +7,15 @@
 {-# LANGUAGE TemplateHaskell   #-}
 
 import           Control.Lens
-import           Data.Aeson
+import           Data.Aeson hiding (defaultOptions)
 import           Data.Map.Syntax ((##))
 import           Data.Monoid
 import           Data.Proxy
 import           Data.Text
 import           GHC.Generics
 import qualified Heist.Interpreted as I
+import           Snap.Core
+import           Snap.CORS
 import           Snap.Snaplet
 import           Snap.Snaplet.Auth
 import           Snap.Snaplet.Session
@@ -113,7 +115,8 @@
   h <- nestSnaplet "" heist $ heistInit "templates"
   s <- nestSnaplet "sess" sess $ initCookieSessionManager "site_key.txt" "sess" Nothing (Just 3600)
   a <- nestSnaplet "" auth $ initJsonFileAuthManager defAuthSettings sess "users.json"
-  addRoutes [("api", serveSnap testApi server)]
+  addRoutes [("api", applyCORS defaultOptions $ serveSnap testApi server)
+            ,("",    writeText "Hello")]
   return $ App h s a
 
 
diff --git a/servant-snap.cabal b/servant-snap.cabal
--- a/servant-snap.cabal
+++ b/servant-snap.cabal
@@ -1,5 +1,5 @@
 name:                servant-snap
-version:             0.8.0.1
+version:             0.8.1
 synopsis:            A family of combinators for defining webservices APIs and serving them
 description:
   Interpret a Servant API as a Snap server, using any Snaplets you like.
@@ -59,7 +59,7 @@
       , network-uri        >= 2.6  && < 2.7
       , mtl                >= 2.0  && < 2.3
       , mmorph             >= 1    && < 1.2
-      , servant            >= 0.8  && < 0.12
+      , servant            >= 0.8  && < 0.13
       , string-conversions >= 0.3  && < 0.5
       , text               >= 1.2  && < 1.3
       , snap               >= 1.0  && < 1.1
@@ -86,6 +86,7 @@
     , lens
     , servant
     , servant-snap
+    , snap-cors
     , map-syntax
     , snap
     , snap-core
diff --git a/src/Servant/Server/Internal/Context.hs b/src/Servant/Server/Internal/Context.hs
--- a/src/Servant/Server/Internal/Context.hs
+++ b/src/Servant/Server/Internal/Context.hs
@@ -8,7 +8,6 @@
 #if __GLASGOW_HASKELL__ < 710
 {-# LANGUAGE OverlappingInstances       #-}
 #endif
-{-# LANGUAGE OverlappingInstances       #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
 {-# LANGUAGE TypeOperators              #-}