diff --git a/guide/src/class.md b/guide/src/class.md
index 2bc3598e..834af6f6 100644
--- a/guide/src/class.md
+++ b/guide/src/class.md
@@ -162,6 +162,7 @@ impl MyClass {
      #[setter]
      fn set_num(&mut self, value: i32) -> PyResult<()> {
         self.num = value
+        Ok(())
      }
 }
 ```
@@ -183,6 +184,7 @@ impl MyClass {
      #[setter(number)]
      fn set_num(&mut self, value: i32) -> PyResult<()> {
         self.num = value
+        Ok(())
      }
 }
 ```
diff --git a/guide/src/parallelism.md b/guide/src/parallelism.md
index ee3df3b4..e8260ed9 100644
--- a/guide/src/parallelism.md
+++ b/guide/src/parallelism.md
@@ -1,3 +1,62 @@
 # Parallelism
 
-TODO
+CPython has an infamous GIL(Global Interpreter Lock) prevents developers
+getting true parallelism. With `pyo3` you can release GIL when executing
+Rust code to achieve true parallelism.
+
+The [`Python::allow_threads`](https://pyo3.github.io/pyo3/pyo3/struct.Python.html#method.allow_threads)
+method temporarily releases the GIL, thus allowing other Python threads to run.
+
+```rust,ignore
+impl Python {
+    pub fn allow_threads<T, F>(self, f: F) -> T where F: Send + FnOnce() -> T {}
+}
+```
+
+Let's take a look at our [word-count](https://github.com/PyO3/pyo3/blob/master/examples/word-count/src/lib.rs) example,
+we have a `wc_parallel` function utilize the [rayon](https://github.com/nikomatsakis/rayon) crate to count words in parallel.
+
+```rust,ignore
+fn wc_parallel(lines: &str, search: &str) -> i32 {
+    lines.par_lines()
+         .map(|line| wc_line(line, search))
+         .sum()
+}
+```
+
+Then in the Python bridge, we have a function `search` exposed to Python runtime which calls `wc_parallel` inside
+`Python::allow_threads` method to enable true parallelism:
+
+```rust,ignore
+#[py::modinit(_word_count)]
+fn init_mod(py: Python, m: &PyModule) -> PyResult<()> {
+
+    #[pyfn(m, "search")]
+    fn search(py: Python, path: String, search: String) -> PyResult<i32> {
+        let mut file = File::open(path)?;
+        let mut contents = String::new();
+        file.read_to_string(&mut contents)?;
+
+        let count = py.allow_threads(move || wc_parallel(&contents, &search));
+        Ok(count)
+    }
+
+    Ok(())
+}
+```
+
+## Benchmark
+
+Let's benchmark the `word-count` example to verify that we did unlock true parallelism with `pyo3`.
+We are using `pytest-benchmark` to benchmark three word count functions:
+
+1. [Pure Python version](https://github.com/PyO3/pyo3/blob/master/examples/word-count/word_count/__init__.py#L9)
+2. [Rust sequential version](https://github.com/PyO3/pyo3/blob/master/examples/word-count/src/lib.rs#L64)
+3. [Rust parallel version](https://github.com/PyO3/pyo3/blob/master/examples/word-count/src/lib.rs#L54)
+
+Benchmark script can be found [here](https://github.com/PyO3/pyo3/blob/master/examples/word-count/tests/test_word_count.py),
+then we can run `pytest tests` to benchmark them.
+
+On MacBook Pro (Retina, 15-inch, Mid 2015) the benchmark gives:
+
+![Benchmark Result](https://user-images.githubusercontent.com/1556054/28604608-81bd6d22-71fe-11e7-8a2c-c3cf3bd0f622.png)