diff --git a/CHANGELOG.md b/CHANGELOG.md
index add0901..1559afd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,18 +1,31 @@
-### 0.1.1
+# Change Log
 
-(November 28th, 2015)
+## [0.2.0] - 2016-10-06
 
-##### Fixes
+### Changed
+
+- Changes internals to be compatible with the latest Orator version.
+- Automatically returns a 404 error when `ModelNotFound` is raised.
+- Adds support for directly returning Orator objects.
+
+
+## [0.1.1] - 2015-11-28
+
+### Fixed
 
 - `Orator` class no longer inherits from  `DatabaseManager` to avoid errors when setting up teardown context.
 
-##### Improvements
+### Changed
 
 - Automatically disconnects after a request.
 
 
-### 0.1
+## [0.1] - 2015-07-07
+
+Initial release
+
 
-(July 7th, 2015)
 
-- Initial release
+[0.2.0]: https://github.com/sdispater/flask-orator/releases/tag/0.2.0
+[0.1.1]: https://github.com/sdispater/flask-orator/releases/tag/0.1.1
+[0.1]: https://github.com/sdispater/flask-orator/releases/tag/0.1
diff --git a/docs/conf.py b/docs/conf.py
index fa30270..924c083 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -56,9 +56,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+version = '0.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.1'
+release = '0.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/flask_orator/version.py b/flask_orator/version.py
index c16d885..2219c2d 100644
--- a/flask_orator/version.py
+++ b/flask_orator/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-VERSION = '0.1.1'
+VERSION = '0.2.0'