diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ec52136..25af8993 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@
 *   Added ability to set paper_size via a driver setter (Philippe Lehoux)
 *   Can support Basic HTTP authentication
 *   Added basic implementation of `send_keys`
-*   Added ability to go_back, go_forward, set the contents of a contenteditable element and Capybara 2.2 support (Pedro Carriço)
+*   Added ability to go_back, go_forward, set the contents of a contenteditable
+    element and Capybara 2.2 support (Pedro Carriço)
 
 #### Bug fixes ####
 *   Use `Capybara::Helpers.normalize_whitespace` in filter_text to strip unicode
@@ -29,11 +30,14 @@
 *   Can set cookies for given domain
 *   Can get open window names with window_handles [Issue #178]
 *   Added ability to read and append headers (Dmitry Vorotilin) [Issue #187]
-*   Added ability to set headers only for the first request (Dmitry Vorotilin) [Issue #337]
+*   Added ability to set headers only for the first request
+    (Dmitry Vorotilin) [Issue #337]
 *   Depend on Cliver for command-line dependency detection.
 *   Added ability to scroll with `driver.scroll_to left, top` (Jim Lim)
-*   Added ability to capture an element  with `driver.render selector: '#id'` (Jim Lim)
-*   Added ability to render base64-encoded image with `driver.render_base64` (Jim Lim) [Issue #189]
+*   Added ability to capture an element  with `driver.render selector: '#id'`
+    (Jim Lim)
+*   Added ability to render base64-encoded image with `driver.render_base64`
+    (Jim Lim) [Issue #189]
 
 #### Bug fixes ####
 
@@ -43,10 +47,12 @@
     (Ryan Schlesinger) [Issue #312]
 *   Fix "wrong exec option symbol: pgroup" error on windows (Andrew Meyer)
     [Issue #314]
-*   Fixed closing of open pipes after use (driver.quit now performs pipe.close) [Issue #310]
+*   Fixed closing of open pipes after use (driver.quit now performs pipe.close)
+    [Issue #310]
 *   Fix NoMethodError when using has_css with a count on svg elements
 *   Fix URI::InvalidURIError raised when setting a cookie after loading a
-    page with a space in the url or when using Capybara::Session#current_path [Issue #349]
+    page with a space in the url or when using Capybara::Session#current_path
+    [Issue #349]
 *   Fix leak of phantomjs processes by adding a GC finalizer to the
     Capybara::Poltergeist::Client object that creates them [Issue #348]
 
@@ -111,7 +117,7 @@
     figuring out timeout errors.
 *   Add the ability to extend the phantomjs environment via browser
     options. e.g.
-    `Capybara::Poltergeist::Driver.new( app, :extensions => ['file.js', 'another.js'])`
+    `Capybara::Poltergeist::Driver.new(app, :extensions => ['file.js', 'another.js'])`
     (Jon Rowe)
 
 #### Bug fixes ####
@@ -270,10 +276,12 @@
 
 #### Bug fixes ####
 
-*   Fix bug where we could end up interacting with an obsolete element. [Issue #30]
+*   Fix bug where we could end up interacting with an obsolete element.
+    [Issue #30]
 *   Raise an suitable error if PhantomJS returns a non-zero exit status.
     Previously a version error would be raised, indicating that the
-    PhantomJS version was too old when in fact it did not start at all. [Issue #23]
+    PhantomJS version was too old when in fact it did not start at all.
+    [Issue #23]
 *   Ensure the `:timeout` option is actually used. [Issue #36]
 *   Nodes need to know which page they are associated with. Before this,
     if Javascript caused a new page to load, existing node references