diff --git a/contrib/Cargo.toml b/contrib/Cargo.toml
index a15c7a01..e72334b5 100644
--- a/contrib/Cargo.toml
+++ b/contrib/Cargo.toml
@@ -29,5 +29,4 @@ lazy_static = { version = "^0.2", optional = true }
 # Tera dependency
 [dependencies.tera]
 git = "https://github.com/SergioBenitez/tera"
-branch = "array-get-filter"
 optional = true
diff --git a/examples/content_types/src/main.rs b/examples/content_types/src/main.rs
index e9e810bf..1b29185a 100644
--- a/examples/content_types/src/main.rs
+++ b/examples/content_types/src/main.rs
@@ -1,4 +1,4 @@
-#![feature(plugin, rustc_macro)]
+#![feature(plugin, proc_macro)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
diff --git a/examples/handlebars_templates/src/main.rs b/examples/handlebars_templates/src/main.rs
index 77988baf..a129611a 100644
--- a/examples/handlebars_templates/src/main.rs
+++ b/examples/handlebars_templates/src/main.rs
@@ -1,4 +1,4 @@
-#![feature(plugin, rustc_macro)]
+#![feature(plugin, proc_macro)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket_contrib;
diff --git a/examples/json/src/main.rs b/examples/json/src/main.rs
index 2b017bf5..9bd829ee 100644
--- a/examples/json/src/main.rs
+++ b/examples/json/src/main.rs
@@ -1,4 +1,4 @@
-#![feature(plugin, rustc_macro)]
+#![feature(plugin, proc_macro)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
diff --git a/examples/todo/Cargo.toml b/examples/todo/Cargo.toml
index 79869237..06f736c2 100644
--- a/examples/todo/Cargo.toml
+++ b/examples/todo/Cargo.toml
@@ -14,10 +14,6 @@ serde_derive = "0.8"
 diesel = { git = "https://github.com/SergioBenitez/diesel", features = ["sqlite"] }
 diesel_codegen = { git = "https://github.com/SergioBenitez/diesel", default_features = false, features = ["sqlite"] }
 
-[dependencies.tera]
-git = "https://github.com/SergioBenitez/tera"
-branch = "array-get-filter"
-
 [dependencies.rocket_contrib]
 path = "../../contrib"
 default_features = false
diff --git a/examples/todo/src/main.rs b/examples/todo/src/main.rs
index 956d8e70..7d3956ea 100644
--- a/examples/todo/src/main.rs
+++ b/examples/todo/src/main.rs
@@ -1,4 +1,4 @@
-#![feature(plugin, custom_derive, custom_attribute, rustc_macro)]
+#![feature(plugin, custom_derive, custom_attribute, proc_macro)]
 #![plugin(rocket_codegen, diesel_codegen)]
 
 extern crate rocket;
diff --git a/examples/todo/templates/index.html.tera b/examples/todo/templates/index.html.tera
index d40aa51d..ead54bd0 100644
--- a/examples/todo/templates/index.html.tera
+++ b/examples/todo/templates/index.html.tera
@@ -23,10 +23,10 @@
         <div class="ten columns">
           <input type="text" placeholder="enter a task description..."
             name="description" id="description" value="" autofocus
-            class="u-full-width {% if msg %}field-{{msg|first}}{% endif %}" />
+            class="u-full-width {% if msg %}field-{{msg.0}}{% endif %}" />
           {% if msg %}
-            <small class="field-{{msg|first}}-msg">
-              {{ msg | get(i=1) }}
+            <small class="field-{{msg.0}}-msg">
+              {{ msg.1 }}
             </small>
           {% endif %}
         </div>