diff --git a/.travis.yml b/.travis.yml
index 6942f66..0337b6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,64 @@
-language: rust
-sudo: false
+# Based on the "trust" template v0.1.2
+# https://github.com/japaric/trust/tree/v0.1.2
 
-rust:
-  - stable
-  - beta
-  - nightly
+dist: trusty
+language: rust
+services: docker
+sudo: required
+
+env:
+  global:
+    - CRATE_NAME=mdbook-toc
+
+matrix:
+  include:
+    # Linux
+    - env: TARGET=i686-unknown-linux-gnu
+    - env: TARGET=x86_64-unknown-linux-gnu
+
+    # OSX
+    - env: TARGET=i686-apple-darwin
+      os: osx
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+
+before_install:
+  - set -e
+  - rustup self update
+
+install:
+  - sh ci/install.sh
+  - source ~/.cargo/env || true
 
 script:
-  - |
-      cargo build &&
-      cargo test
+  - bash ci/script.sh
+
+after_script: set +e
+
+before_deploy:
+  - sh ci/before_deploy.sh
+
+deploy:
+  api_key:
+    secure: "VE2CE39FAa8lSNZ4XhjN8DNMpylVmr/6PC8JvHjjhrKUfCWS6LrvYh3iSKX6bg8JHeFZWaldHK1YyVA9gJYzBjKpadKj1Ga0Hu2lFjYzFV8BBgBp2/cf63ERDbPbwbl/2OZoyEC6JrohbDHRJ34BP3jvwa80t3cc4JsiKYN6cJMVU9zsYZYuIn7uiDRJnAaxkOWxmKY1vfka/oS8x6qjn84NrhXexFNWVeJ/dB+S4JeCqa4OhiupHSRurxeFgcOzvQtaxZFumKWGX0uAXKeBuGK8lQDwIOh8yNAEbuLat8tW+zapy3Yjnqt4p0D6HdcSRhJEq5FyI3h1NruDScHcn2/TVm0Jiwl4xM9DhnrRCOW04KRl8a54cs95tC0TenboxNnW9E9J0MMq/zxFFbHhxHcH0Kn4DMjLNsxj13CaIsc8/tkUGJyq3+FrUOFI5UlEj15VQqhTnHG/vuuudRQuc7cnfUA7BWPZdhNcdTH50z4JsOSejHHBBABLTJqGY7Ra5iCTrCfE1yYbziR8QaPfwB3HNnN8JyKZchWbXO0Bv4Db0yEbKzoq7wlYJD2jp4L+UvFox0yZ0/ZZVFvOuk33ofMcXEigxt1MHrl2+0/4s//OtAn+wII7RJSit4uuzM5nn38LtMDrMGC5w+6hf2VlbUqBOjg36r7zcpx/Olpk+LM="
+  file_glob: true
+  file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
+  on:
+    condition: $TRAVIS_RUST_VERSION = stable
+    tags: true
+  provider: releases
+  skip_cleanup: true
+
+cache: cargo
+before_cache:
+  # Travis can't cache files that are not readable by "others"
+  - chmod -R a+r $HOME/.cargo
+
+branches:
+  only:
+    # release tags
+    - /^\d+\.\d+\.\d+.*$/
+    - master
 
 notifications:
   email: false
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..82a1879
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,66 @@
+# Based on the "trust" template v0.1.2
+# https://github.com/japaric/trust/tree/v0.1.2
+
+environment:
+  global:
+    RUST_VERSION: stable
+
+    CRATE_NAME: mdbook-toc
+
+  matrix:
+    # MSVC
+    - TARGET: i686-pc-windows-msvc
+    - TARGET: x86_64-pc-windows-msvc
+
+install:
+  - ps: >-
+      If ($Env:TARGET -eq 'x86_64-pc-windows-gnu') {
+        $Env:PATH += ';C:\msys64\mingw64\bin'
+      } ElseIf ($Env:TARGET -eq 'i686-pc-windows-gnu') {
+        $Env:PATH += ';C:\msys64\mingw32\bin'
+      }
+  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
+  - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_VERSION%
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+  - rustc -Vv
+  - cargo -V
+
+test_script:
+  # we don't run the "test phase" when doing deploys
+  - if [%APPVEYOR_REPO_TAG%]==[false] (
+      cargo test --target %TARGET% &&
+      cargo build --target %TARGET%
+    )
+
+before_deploy:
+  - cargo rustc --target %TARGET% --release --bin mdbook-toc -- -C lto
+  - ps: ci\before_deploy.ps1
+
+deploy:
+  artifact: /.*\.zip/
+  auth_token:
+    secure: "kTwxCDJYj3QdFwxUiCEnUN8VcFAfU6KJKttab4G9LPCkpxVNexMvFTwWkp7sgamP"
+  description: ''
+  on:
+    RUST_VERSION: stable
+    appveyor_repo_tag: true
+  provider: GitHub
+
+cache:
+  - C:\Users\appveyor\.cargo\registry
+  - target
+
+branches:
+  only:
+    # Release tags
+    - /^\d+\.\d+\.\d+.*$/
+    - master
+
+notifications:
+  - provider: Email
+    on_build_success: false
+    on_build_failure: false
+    on_build_status_changed: false
+
+# Building is done in the test phase, so we disable Appveyor's build phase.
+build: false
diff --git a/ci/before_deploy.ps1 b/ci/before_deploy.ps1
new file mode 100644
index 0000000..28ef29a
--- /dev/null
+++ b/ci/before_deploy.ps1
@@ -0,0 +1,22 @@
+# This script takes care of packaging the build artifacts that will go in the
+# release zipfile
+
+$SRC_DIR = $PWD.Path
+$STAGE = [System.Guid]::NewGuid().ToString()
+
+Set-Location $ENV:Temp
+New-Item -Type Directory -Name $STAGE
+Set-Location $STAGE
+
+$ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET).zip"
+
+Copy-Item "$SRC_DIR\target\$($Env:TARGET)\release\mdbook-toc.exe" '.\'
+
+7z a "$ZIP" *
+
+Push-AppveyorArtifact "$ZIP"
+
+Remove-Item *.* -Force
+Set-Location ..
+Remove-Item $STAGE
+Set-Location $SRC_DIR
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
new file mode 100644
index 0000000..77ede04
--- /dev/null
+++ b/ci/before_deploy.sh
@@ -0,0 +1,31 @@
+# This script takes care of building your crate and packaging it for release
+
+set -ex
+
+main() {
+    local src=$(pwd) \
+          stage=
+
+    case $TRAVIS_OS_NAME in
+        linux)
+            stage=$(mktemp -d)
+            ;;
+        osx)
+            stage=$(mktemp -d -t tmp)
+            ;;
+    esac
+
+    test -f Cargo.lock || cargo generate-lockfile
+
+    cross rustc --bin mdbook-toc --target $TARGET --release -- -C lto
+
+    cp target/$TARGET/release/mdbook-toc $stage/
+
+    cd $stage
+    tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz *
+    cd $src
+
+    rm -rf $stage
+}
+
+main
diff --git a/ci/install.sh b/ci/install.sh
new file mode 100644
index 0000000..80e18e4
--- /dev/null
+++ b/ci/install.sh
@@ -0,0 +1,47 @@
+set -ex
+
+main() {
+    local target=
+    if [ $TRAVIS_OS_NAME = linux ]; then
+        target=x86_64-unknown-linux-musl
+        sort=sort
+    else
+        target=x86_64-apple-darwin
+        sort=gsort  # for `sort --sort-version`, from brew's coreutils.
+    fi
+
+    # Builds for iOS are done on OSX, but require the specific target to be
+    # installed.
+    case $TARGET in
+        aarch64-apple-ios)
+            rustup target install aarch64-apple-ios
+            ;;
+        armv7-apple-ios)
+            rustup target install armv7-apple-ios
+            ;;
+        armv7s-apple-ios)
+            rustup target install armv7s-apple-ios
+            ;;
+        i386-apple-ios)
+            rustup target install i386-apple-ios
+            ;;
+        x86_64-apple-ios)
+            rustup target install x86_64-apple-ios
+            ;;
+    esac
+
+    # This fetches latest stable release
+    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
+                       | cut -d/ -f3 \
+                       | grep -E '^v[0.1.0-9.]+$' \
+                       | $sort --version-sort \
+                       | tail -n1)
+    curl -LSfs https://japaric.github.io/trust/install.sh | \
+        sh -s -- \
+           --force \
+           --git japaric/cross \
+           --tag $tag \
+           --target $target
+}
+
+main
diff --git a/ci/script.sh b/ci/script.sh
new file mode 100644
index 0000000..e61e155
--- /dev/null
+++ b/ci/script.sh
@@ -0,0 +1,18 @@
+# This script takes care of testing your crate
+
+set -ex
+
+main() {
+    cross build --target $TARGET
+
+    if [ ! -z $DISABLE_TESTS ]; then
+        return
+    fi
+
+    cross test --target $TARGET
+}
+
+# we don't run the "test phase" when doing deploys
+if [ -z $TRAVIS_TAG ]; then
+    main
+fi
diff --git a/src/lib.rs b/src/lib.rs
index 5c4e62e..029d7f1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -142,6 +142,7 @@ mod test {
   * [Header 2.2](#header-22)
     * [Header 2.2.1](#header-221)
 
+
 # Header 1
 
 ## Header 1.1