diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44df74e..3e9cda9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,18 @@
Java SemVer Changelog
=====================
+### 0.8.0 (Aug 18, 2014) ###
+* Rearranged exceptions hierarchy
+* Refactored `VersionParser` and `ExpressionParser`
+* [[#7](https://github.com/zafarkhaja/java-semver/issues/7)] Improved error handling and error reporting in the Parsers
+* Made some minor improvements and bug fixes
+* Updated the `README` file with the "Exception Handling" section
+
### 0.7.2 (Dec 30, 2013) ###
-* [[Issue #8](https://github.com/zafarkhaja/java-semver/issues/8)] Fixed `Version.hashCode()` to comply with `Version.equals()`
+* [[#8](https://github.com/zafarkhaja/java-semver/issues/8)] Fixed `Version.hashCode()` to comply with `Version.equals()`
### 0.7.1 (Dec 01, 2013) ###
-* [[Issue #5](https://github.com/zafarkhaja/java-semver/issues/5)] Got rid of 'unchecked' warnings
+* [[#5](https://github.com/zafarkhaja/java-semver/issues/5)] Got rid of 'unchecked' warnings
* Made minor Javadoc corrections
* Made small code improvements
* Configured `maven-compiler-plugin` to show all warnings
@@ -13,9 +20,9 @@ Java SemVer Changelog
### 0.7.0 (Nov 16, 2013) ###
* Adapted the library to the SemVer 2.0.0
-* [[Issue #1](https://github.com/zafarkhaja/java-semver/issues/1)] Created the SemVer Expressions Parser
-* [[Issue #2](https://github.com/zafarkhaja/java-semver/issues/2)] Added Javadoc to the source code
-* [[Issue #4](https://github.com/zafarkhaja/java-semver/issues/4)] Deployed to the Maven Central Repository
+* [[#1](https://github.com/zafarkhaja/java-semver/issues/1)] Created the SemVer Expressions Parser
+* [[#2](https://github.com/zafarkhaja/java-semver/issues/2)] Added Javadoc to the source code
+* [[#4](https://github.com/zafarkhaja/java-semver/issues/4)] Deployed to the Maven Central Repository
* Implemented a parser instead of RegExps for the version parsing
* Created the `MetadataVersion.NULL` object, refactored
* Made some refactoring and minor improvements to the code
diff --git a/README.md b/README.md
index f4b1cf8..57b835b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Java SemVer v0.7.2 (SemVer 2) [![Build Status](https://travis-ci.org/zafarkhaja/java-semver.png)](https://travis-ci.org/zafarkhaja/java-semver)
+Java SemVer v0.8.0 (SemVer 2) [![Build Status](https://travis-ci.org/zafarkhaja/java-semver.png)](https://travis-ci.org/zafarkhaja/java-semver)
=============================
Java SemVer is a Java implementation of the Semantic Versioning Specification
@@ -33,7 +33,7 @@ project.
com.github.zafarkhaja
java-semver
- 0.7.2
+ 0.8.0
~~~
@@ -42,7 +42,7 @@ project.
com.github.zafarkhaja
java-semver
- 0.8.0-SNAPSHOT
+ 0.9.0-SNAPSHOT
~~~
**NOTE**: To use the development version you need to add the SNAPSHOT repository