diff --git a/.travis.yml b/.travis.yml
index ec26812..779d9f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,11 @@ jobs:
       julia: 1.0
       os: linux
       script:
-        # - julia -e 'import Pkg; Pkg.clone(pwd()); Pkg.build("ImageCore")'
-        - julia -e 'import Pkg; Pkg.add("Documenter")'
-        - julia -e 'using Pkg; Pkg.add("ImageDraw.jl")' # Needed for Docs
-        - julia -e 'using Pkg; import ImageFeatures; cd(joinpath(dirname(pathof(ImageFeatures)), "..")); ENV["DOCUMENTER_DEBUG"] = "true"; include(joinpath("docs", "make.jl"))'
+        - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));
+                                               Pkg.instantiate()'
+        - julia --project=docs/ docs/make.jl
+      after_success: skip
+
 after_success:
   # push coverage results to Codecov
   - julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
diff --git a/docs/Project.toml b/docs/Project.toml
new file mode 100644
index 0000000..2f09819
--- /dev/null
+++ b/docs/Project.toml
@@ -0,0 +1,7 @@
+[deps]
+CoordinateTransformations = "150eb455-5306-5404-9cee-2592286d6298"
+Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+ImageDraw = "4381153b-2b60-58ae-a1ba-fd683676385f"
+ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
+Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
+TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"
diff --git a/docs/make.jl b/docs/make.jl
index 099b266..1a074f7 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -1,7 +1,7 @@
 using Documenter, ImageFeatures
 
-makedocs(format   = :html,
-         sitename = "ImageFeatures",
+makedocs(sitename = "ImageFeatures",
+         format = Documenter.HTML(prettyurls = get(ENV, "CI", nothing) == "true"),
          pages    = ["Home" => "index.md",
                      "Tutorials" => [
                          "BRIEF" => "tutorials/brief.md",
@@ -17,8 +17,4 @@ makedocs(format   = :html,
          )
 
 deploydocs(repo   = "github.com/JuliaImages/ImageFeatures.jl.git",
-           julia  = "0.6",
-           target = "build",
-           deps   = nothing,
-           make   = nothing,
            )
diff --git a/docs/src/tutorials/brief.md b/docs/src/tutorials/brief.md
index 76131b5..6cc5300 100644
--- a/docs/src/tutorials/brief.md
+++ b/docs/src/tutorials/brief.md
@@ -27,7 +27,7 @@ using ImageFeatures, TestImages, Images, ImageDraw, CoordinateTransformations
 img = testimage("lena_gray_512");
 img1 = Gray.(img);
 trans = Translation(-100, -200)
-img2 = warp(img1, trans, indices(img1));
+img2 = warp(img1, trans, axes(img1));
 nothing # hide
 ```
 
diff --git a/docs/src/tutorials/brisk.md b/docs/src/tutorials/brisk.md
index 18bafac..72515a7 100644
--- a/docs/src/tutorials/brisk.md
+++ b/docs/src/tutorials/brisk.md
@@ -25,7 +25,7 @@ img = testimage("lighthouse")
 img1 = Gray.(img)
 rot = recenter(RotMatrix(5pi/6), [size(img1)...] .÷ 2)  # a rotation around the center
 tform = rot ∘ Translation(-50, -40)
-img2 = warp(img1, tform, indices(img1))
+img2 = warp(img1, tform, axes(img1))
 nothing # hide
 ```
 
diff --git a/docs/src/tutorials/freak.md b/docs/src/tutorials/freak.md
index c64838b..291a66a 100644
--- a/docs/src/tutorials/freak.md
+++ b/docs/src/tutorials/freak.md
@@ -21,7 +21,7 @@ img = testimage("lighthouse")
 img1 = Gray.(img)
 rot = recenter(RotMatrix(5pi/6), [size(img1)...] .÷ 2)  # a rotation around the center
 tform = rot ∘ Translation(-50, -40)
-img2 = warp(img1, tform, indices(img1))
+img2 = warp(img1, tform, axes(img1))
 nothing # hide
 ```
 
diff --git a/docs/src/tutorials/orb.md b/docs/src/tutorials/orb.md
index 9f3e56b..8be6647 100644
--- a/docs/src/tutorials/orb.md
+++ b/docs/src/tutorials/orb.md
@@ -26,7 +26,7 @@ img = testimage("lighthouse")
 img1 = Gray.(img)
 rot = recenter(RotMatrix(5pi/6), [size(img1)...] .÷ 2)  # a rotation around the center
 tform = rot ∘ Translation(-50, -40)
-img2 = warp(img1, tform, indices(img1))
+img2 = warp(img1, tform, axes(img1))
 nothing # hide
 ```