diff --git a/library/Magicbane/App.hs b/library/Magicbane/App.hs
--- a/library/Magicbane/App.hs
+++ b/library/Magicbane/App.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
-{-# LANGUAGE NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, UnicodeSyntax, DataKinds, TypeOperators, MultiParamTypeClasses, TypeFamilies, FlexibleContexts, FlexibleInstances, UndecidableInstances, GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, UnicodeSyntax, DataKinds, TypeOperators, MultiParamTypeClasses, TypeFamilies, FlexibleContexts, FlexibleInstances, UndecidableInstances, GeneralizedNewtypeDeriving, CPP #-}
 
 -- | Extends Servant with context.
 --   Basically wrapping Servant in a ReaderT of your type.
@@ -14,7 +14,7 @@
 import           Control.Monad.Except as X (MonadError, throwError)
 import           Data.Proxy as X
 import           Data.Has as X
-import           Servant as X
+import           Servant as X hiding (And)
 
 newtype MagicbaneApp β α = MagicbaneApp {
   unMagicbaneApp ∷ ReaderT β (ExceptT ServantErr IO) α
@@ -30,7 +30,11 @@
 runMagicbaneExcept ctx a = ExceptT $ liftIO $ runExceptT $ runReaderT (unMagicbaneApp a) ctx
 
 magicbaneToExcept ∷ β → MagicbaneApp β :~> ExceptT ServantErr IO
+#if MIN_VERSION_servant_server(0,10,0)
+magicbaneToExcept ctx = NT $ runMagicbaneExcept ctx
+#else
 magicbaneToExcept ctx = Nat $ runMagicbaneExcept ctx
+#endif
 
 -- | Constructs a WAI application from an API definition, a Servant context (used for auth mainly), the app context and the actual action handlers.
 magicbaneApp api sctx ctx actions = serveWithContext api sctx $ srv ctx
diff --git a/magicbane.cabal b/magicbane.cabal
--- a/magicbane.cabal
+++ b/magicbane.cabal
@@ -1,5 +1,5 @@
 name:            magicbane
-version:         0.1.0
+version:         0.1.1
 synopsis:        A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…
 description:     Inspired by Dropwizard, Magicbane provides a packaged framework for developing web services using the best available libraries, including Servant, ClassyPrelude, Aeson, EKG/monad-metrics, fast-logger/monad-logger, wai-cli and others.
 category:        Web