diff --git a/heist.cabal b/heist.cabal
--- a/heist.cabal
+++ b/heist.cabal
@@ -1,5 +1,5 @@
 name:           heist
-version:        1.0.1.0
+version:        1.0.1.1
 synopsis:       An Haskell template system supporting both HTML5 and XML.
 description:
     Heist is a powerful template system that supports both HTML5 and XML.
@@ -30,7 +30,8 @@
 cabal-version:  >= 1.8.0.4
 homepage:       http://snapframework.com/
 category:       Web, Snap
-Tested-With:    GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1
+Tested-With:    GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3
+                GHC == 8.0.1, GHC == 8.2.2
 
 extra-source-files:
   .ghci,
@@ -151,14 +152,14 @@
     Heist.Interpreted.Internal
 
   build-depends:
-    aeson                      >= 0.6     && < 1.1,
+    aeson                      >= 0.6     && < 1.3,
     attoparsec                 >= 0.10    && < 0.14,
-    base                       >= 4       && < 5,
+    base                       >= 4.5     && < 5,
     blaze-builder              >= 0.2     && < 0.5,
-    blaze-html                 >= 0.4     && < 0.9,
+    blaze-html                 >= 0.4     && < 0.10,
     bytestring                 >= 0.9     && < 0.11,
     containers                 >= 0.2     && < 0.6,
-    directory                  >= 1.1     && < 1.3,
+    directory                  >= 1.1     && < 1.4,
     directory-tree             >= 0.10    && < 0.13,
     dlist                      >= 0.5     && < 0.9,
     filepath                   >= 1.3     && < 1.5,
@@ -167,14 +168,14 @@
     map-syntax                 >= 0.2     && < 0.3,
     monad-control              >= 0.3     && < 1.1,
     mtl                        >= 2.0     && < 2.3,
-    process                    >= 1.1     && < 1.5,
+    process                    >= 1.1     && < 1.7,
     random                     >= 1.0.1.0 && < 1.2,
     text                       >= 0.10    && < 1.3,
-    time                       >= 1.1     && < 1.7,
+    time                       >= 1.1     && < 1.9,
     transformers               >= 0.3     && < 0.6,
     transformers-base          >= 0.4     && < 0.5,
     unordered-containers       >= 0.1.4   && < 0.3,
-    vector                     >= 0.9     && < 0.12,
+    vector                     >= 0.9     && < 0.13,
     xmlhtml                    >= 0.2.3.5 && < 0.3
 
   if impl(ghc >= 6.12.0)
@@ -207,8 +208,8 @@
 
   build-depends:
     HUnit                      >= 1.2      && < 2,
-    QuickCheck                 >= 2        && < 2.10,
-    lens                       >= 4.3      && < 4.15,
+    QuickCheck                 >= 2        && < 2.11,
+    lens                       >= 4.3      && < 4.16,
     test-framework             >= 0.4      && < 0.9,
     test-framework-hunit       >= 0.2.7    && < 0.4,
     test-framework-quickcheck2 >= 0.2.12.1 && < 0.4,
@@ -248,7 +249,7 @@
 
   build-depends:
     HUnit,
-    criterion                 >= 1.0     && < 1.2,
+    criterion                 >= 1.0     && < 1.3,
     test-framework,
     test-framework-hunit,
 
@@ -272,7 +273,7 @@
     mtl,
     process,
     random,
-    statistics                 >= 0.11    && < 0.14,
+    statistics                 >= 0.11    && < 0.15,
     text,
     time,
     transformers,
diff --git a/src/Heist/Common.hs b/src/Heist/Common.hs
--- a/src/Heist/Common.hs
+++ b/src/Heist/Common.hs
@@ -350,6 +350,7 @@
     -- rendering will include a byte order mark. (RFC 2781, Sec. 3.3)
     enc X.UTF16BE = "utf-16"
     enc X.UTF16LE = "utf-16"
+    enc X.ISO_8859_1 = "iso-8859-1"
 
 
 ------------------------------------------------------------------------------
diff --git a/src/Heist/Compiled/Internal.hs b/src/Heist/Compiled/Internal.hs
--- a/src/Heist/Compiled/Internal.hs
+++ b/src/Heist/Compiled/Internal.hs
@@ -255,7 +255,7 @@
 
 
 ------------------------------------------------------------------------------
--- | Given a list of output chunks, consolidate turns consecutive runs of
+-- | Given a list of output chunks, codeGen turns consecutive runs of
 -- @Pure Html@ values into maximally-efficient pre-rendered strict
 -- 'ByteString' chunks.
 codeGen :: Monad n => DList (Chunk n) -> RuntimeSplice n Builder
@@ -613,6 +613,10 @@
 ------------------------------------------------------------------------------
 -- | Looks up a compiled template and returns a runtime monad computation that
 -- constructs a builder.
+--
+-- Note that template names should not include the .tpl extension:
+--
+-- @renderTemplate hs "index"@
 renderTemplate :: Monad n
                => HeistState n
                -> ByteString
@@ -754,7 +758,7 @@
 
 
 ------------------------------------------------------------------------------
--- | Saves the results of a runtme computation in a 'Promise' so they don't
+-- | Saves the results of a runtime computation in a 'Promise' so they don't
 -- get recalculated if used more than once.
 --
 -- Note that this is just a specialized version of function application ($)
diff --git a/src/Heist/Interpreted/Internal.hs b/src/Heist/Interpreted/Internal.hs
--- a/src/Heist/Interpreted/Internal.hs
+++ b/src/Heist/Interpreted/Internal.hs
@@ -387,6 +387,10 @@
 -- the root template was an HTML or XML format template.  It will always be
 -- @text/html@ or @text/xml@.  If a more specific MIME type is needed for a
 -- particular XML application, it must be provided by the application.
+--
+-- Note that template names should not include the .tpl extension:
+--
+-- @renderTemplate hs "index"@
 renderTemplate :: Monad n
                => HeistState n
                -> ByteString
diff --git a/test/suite/Heist/Tutorial/CompiledSplices.lhs b/test/suite/Heist/Tutorial/CompiledSplices.lhs
--- a/test/suite/Heist/Tutorial/CompiledSplices.lhs
+++ b/test/suite/Heist/Tutorial/CompiledSplices.lhs
@@ -249,7 +249,6 @@
 
 < failingSplice :: MonadSnap m => C.Splice m
 < failingSplice = do
-<     children <- childNodes <$> getParamNode
 <     promise <- C.newEmptyPromise
 <     outputChildren <- C.withSplices C.runChildren splices (C.getPromise promise)
 <     return $ C.yieldRuntime $ do