diff --git a/examples/template_tera/Cargo.toml b/examples/template_tera/Cargo.toml
index b5ce86cad..36e8d8e55 100644
--- a/examples/template_tera/Cargo.toml
+++ b/examples/template_tera/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 
 [dependencies]
 env_logger = "0.4"
-actix = "^0.3.1"
-actix-web = { git = "https://github.com/actix/actix-web.git" }
+actix = "^0.3.5"
+actix-web = { git = "https://github.com/actix/actix-web", features=["signal"] }
 tera = "*"
diff --git a/examples/template_tera/README.md b/examples/template_tera/README.md
new file mode 100644
index 000000000..35829599f
--- /dev/null
+++ b/examples/template_tera/README.md
@@ -0,0 +1,17 @@
+# template_tera
+
+Minimal example of using the template [tera](https://github.com/Keats/tera) that displays a form.
+
+## Usage
+
+### server
+
+```bash
+cd actix-web/examples/template_tera
+cargo run (or ``cargo watch -x run``)
+# Started http server: 127.0.0.1:8080
+```
+
+### web client
+
+- [http://localhost:8080](http://localhost:8080)
diff --git a/examples/template_tera/src/main.rs b/examples/template_tera/src/main.rs
index 946c78bf7..3857d489f 100644
--- a/examples/template_tera/src/main.rs
+++ b/examples/template_tera/src/main.rs
@@ -4,6 +4,8 @@ extern crate env_logger;
 #[macro_use]
 extern crate tera;
 use actix_web::*;
+use actix::Arbiter;
+use actix::actors::signal::{ProcessSignals, Subscribe};
 
 struct State {
     template: tera::Tera,  // <- store tera template in application state
@@ -30,7 +32,7 @@ fn main() {
     let _ = env_logger::init();
     let sys = actix::System::new("tera-example");
 
-    HttpServer::new(|| {
+    let addr = HttpServer::new(|| {
         let tera = compile_templates!(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*"));
 
         Application::with_state(State{template: tera})
@@ -40,6 +42,10 @@ fn main() {
         .bind("127.0.0.1:8080").unwrap()
         .start();
 
+    // Subscribe to unix signals
+    let signals = Arbiter::system_registry().get::<ProcessSignals>();
+    signals.send(Subscribe(addr.subscriber()));
+
     println!("Started http server: 127.0.0.1:8080");
     let _ = sys.run();
 }