From d3e0d8bfb2880549e17c95ecdbf3b9aa4f5e3cad Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Tue, 1 May 2018 09:17:41 -0700
Subject: [PATCH] Prepare for 1.18.0 release

---
 CHANGELOG.md                        | 11 +++++++++++
 README.md                           |  2 +-
 lib/capybara/poltergeist/version.rb |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a66fe1..0292d4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### 1.18.0 ###
+
+#### Features ####
+*  User agent and other headers persist across windows (Tony Novak)[Issue #915]
+*  Capybara 3 support (Thomas Walpole)
+*  Support configuring PhantomJS page setting when initializing driver (Thomas Walpole)
+*  Support for mouse click with offset and button presses (Thomas Walpole)
+
+#### Bug Fixes ####
+* Fixed page source potentially blank based on page load timing (Thomas Walpole)
+
 ### 1.17.0 ###
 
 #### Features ####
diff --git a/README.md b/README.md
index 261d51f..3934768 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ provided by [PhantomJS](http://phantomjs.org/).
 **If you're viewing this at https://github.com/teampoltergeist/poltergeist,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(1.17.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.17.0)**
+(1.18.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.18.0)**
 
 ## Getting help ##
 
diff --git a/lib/capybara/poltergeist/version.rb b/lib/capybara/poltergeist/version.rb
index 354a27b..43eefb4 100644
--- a/lib/capybara/poltergeist/version.rb
+++ b/lib/capybara/poltergeist/version.rb
@@ -2,6 +2,6 @@
 
 module Capybara
   module Poltergeist
-    VERSION = "1.17.0"
+    VERSION = "1.18.0"
   end
 end