diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -240,6 +240,20 @@
 cabal install pandoc-crossref
 ```
 
+However, I highly recommend you use a sandbox for installation, e.g.
+
+```bash
+cabal update
+mkdir pandoc-crossref
+cd pandoc-crossref
+cabal sandbox init
+cabal install pandoc-crossref
+```
+
+This will get `pandoc-crossref` installed into `.cabal-sandbox/bin`. Pandoc will also be built, if it's not installed as a Haskell library system-wide. You might also want to install `pandoc-citeproc` in the same sandbox, if that's the case (`cabal install pandoc-citeproc`).
+
+For Windows users, there is a pre-built executable available at [releases page](https://github.com/lierdakil/pandoc-crossref/releases/latest). Bear in mind that it is a product of an automated build script, and as such, provided as-is, with zero guarantees.
+
 ## Usage
 
 Run pandoc with `--filter` option, passing path to pandoc-crossref executable, or simply `pandoc-crossref`, if it's in PATH:
diff --git a/lib/Text/Pandoc/CrossRef/References/Blocks.hs b/lib/Text/Pandoc/CrossRef/References/Blocks.hs
--- a/lib/Text/Pandoc/CrossRef/References/Blocks.hs
+++ b/lib/Text/Pandoc/CrossRef/References/Blocks.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, Rank2Types, MultiWayIf #-}
+{-# LANGUAGE Rank2Types, MultiWayIf #-}
 module Text.Pandoc.CrossRef.References.Blocks
   ( replaceAll
   ) where
diff --git a/lib/Text/Pandoc/CrossRef/Util/Gap.hs b/lib/Text/Pandoc/CrossRef/Util/Gap.hs
--- a/lib/Text/Pandoc/CrossRef/Util/Gap.hs
+++ b/lib/Text/Pandoc/CrossRef/Util/Gap.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 module Text.Pandoc.CrossRef.Util.Gap where
 
 import qualified Text.Pandoc as P
diff --git a/lib/Text/Pandoc/CrossRef/Util/Meta.hs b/lib/Text/Pandoc/CrossRef/Util/Meta.hs
--- a/lib/Text/Pandoc/CrossRef/Util/Meta.hs
+++ b/lib/Text/Pandoc/CrossRef/Util/Meta.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, FlexibleContexts #-}
+{-# LANGUAGE FlexibleContexts #-}
 module Text.Pandoc.CrossRef.Util.Meta where
 
 import Text.Pandoc.CrossRef.Util.Gap
diff --git a/lib/Text/Pandoc/CrossRef/Util/Settings.hs b/lib/Text/Pandoc/CrossRef/Util/Settings.hs
--- a/lib/Text/Pandoc/CrossRef/Util/Settings.hs
+++ b/lib/Text/Pandoc/CrossRef/Util/Settings.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 module Text.Pandoc.CrossRef.Util.Settings (getSettings, defaultMeta) where
 
 import Text.Pandoc hiding (readMarkdown)
diff --git a/pandoc-crossref.cabal b/pandoc-crossref.cabal
--- a/pandoc-crossref.cabal
+++ b/pandoc-crossref.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                pandoc-crossref
-version:             0.2.0.0
+version:             0.2.0.1
 synopsis:            Pandoc filter for cross-references
 description:         pandoc-crossref is a pandoc filter for numbering figures, equations, tables and cross-references to them.
 license:             GPL-2
@@ -25,7 +25,7 @@
 source-repository this
   type: git
   location: https://github.com/lierdakil/pandoc-crossref
-  tag: v0.2.0.0
+  tag: v0.2.0.1
 
 library
   exposed-modules:     Text.Pandoc.CrossRef
@@ -46,7 +46,7 @@
                      , Text.Pandoc.CrossRef.Util.Settings.Template
                      , Text.Pandoc.CrossRef.Util.Gap
   build-depends:       base >=4.2 && <5
-                     , pandoc >= 1.16 && <1.17
+                     , pandoc >= 1.16 && <1.18
                      , mtl >= 1.1 && <2.3
                      , containers >= 0.1 && <0.6
                      , pandoc-types >= 1.12.4.1 && < 1.17
@@ -62,14 +62,11 @@
   hs-source-dirs:      lib
   Ghc-Options:         -Wall
   default-language:    Haskell2010
-  other-extensions:    RankNTypes
-                     , CPP
-                     , FlexibleContexts
 
 executable pandoc-crossref
   main-is:             pandoc-crossref.hs
   build-depends:       base >=4.2 && <5
-                     , pandoc >= 1.16 && <1.17
+                     , pandoc >= 1.16 && <1.18
                      , mtl >= 1.1 && <2.3
                      , containers >= 0.1 && <0.6
                      , pandoc-types >= 1.12.4.1 && < 1.17
@@ -86,7 +83,7 @@
   Main-Is:        test-pandoc-crossref.hs
   hs-source-dirs: test, lib
   Build-Depends:   base >=4.2 && <5
-                 , pandoc >= 1.16 && <1.17
+                 , pandoc >= 1.16 && <1.18
                  , mtl >= 1.1 && <2.3
                  , containers >= 0.1 && <0.6
                  , pandoc-types >= 1.12.4.1 && < 1.17
@@ -102,6 +99,25 @@
                  , roman-numerals == 0.5.*
                  , syb >= 0.4 && < 0.7
                  , pandoc-crossref
-  other-modules: Native
+  other-modules:
+                Native
+                Paths_pandoc_crossref
+                Text.Pandoc.CrossRef
+                Text.Pandoc.CrossRef.References
+                Text.Pandoc.CrossRef.References.Blocks
+                Text.Pandoc.CrossRef.References.List
+                Text.Pandoc.CrossRef.References.Refs
+                Text.Pandoc.CrossRef.References.Types
+                Text.Pandoc.CrossRef.Util.CodeBlockCaptions
+                Text.Pandoc.CrossRef.Util.CustomLabels
+                Text.Pandoc.CrossRef.Util.Gap
+                Text.Pandoc.CrossRef.Util.Meta
+                Text.Pandoc.CrossRef.Util.ModifyMeta
+                Text.Pandoc.CrossRef.Util.Options
+                Text.Pandoc.CrossRef.Util.Settings
+                Text.Pandoc.CrossRef.Util.Settings.Gen
+                Text.Pandoc.CrossRef.Util.Settings.Template
+                Text.Pandoc.CrossRef.Util.Template
+                Text.Pandoc.CrossRef.Util.Util
   Ghc-Options:  -rtsopts -Wall -fno-warn-unused-do-bind -threaded
   Default-Language: Haskell2010
diff --git a/test/test-pandoc-crossref.hs b/test/test-pandoc-crossref.hs
--- a/test/test-pandoc-crossref.hs
+++ b/test/test-pandoc-crossref.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, FlexibleContexts #-}
+{-# LANGUAGE FlexibleContexts #-}
 import Test.Hspec
 import Text.Pandoc hiding (readMarkdown)
 import Text.Pandoc.Builder