diff --git a/.travis.yml b/.travis.yml
index 7215b03b..e8704f07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 rvm:
   - 2.2
   - 2.3.2
-  - 2.4.0-preview1
+  - 2.4.0
   - ruby-head  
 
 cache:
@@ -50,4 +50,3 @@ matrix:
       env: JRUBY_OPTS='--server -Xcompile.invokedynamic=false' JAVA_OPTS='-Djava.security.egd=file:///dev/urandom'
       jdk: oraclejdk8
     - rvm: ruby-head
-    - rvm: 2.4.0-preview1
diff --git a/Gemfile.lock b/Gemfile.lock
index 14ea7a50..fc312175 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    nats (0.8.0)
+    nats (0.8.2)
       eventmachine (~> 1.2, >= 1.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     daemons (1.2.4)
-    diff-lcs (1.2.5)
-    eventmachine (1.2.1)
-    json_pure (2.0.2)
+    diff-lcs (1.3)
+    eventmachine (1.2.3)
+    json_pure (2.0.3)
     rack (2.0.1)
-    rake (11.3.0)
+    rake (12.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -43,4 +43,4 @@ DEPENDENCIES
   thin (>= 1.6.0)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6
diff --git a/HISTORY.md b/HISTORY.md
index 4757560d..b4f82c10 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,17 @@
 # HISTORY
 
+## v0.8.2 (March 14, 2017)
+  - Allow setting name from client on connect (#129)
+  - Add discovered servers helper for servers announced via async INFO (#136)
+  - Add time based reconnect backoff (#139)
+  - Modify lang sent on connect when using jruby (#135)
+  - Update eventmachine dependencies (#134)
+
+## v0.8.0 (August 10, 2016)
+  - Added cluster auto discovery handling which is supported on v0.9.2 server release (#125)
+  - Added jruby part of the build (both in openjdk and oraclejdk runtimes) (#122 #123)
+  - Fixed ping interval accounting (#120)
+
 ## v0.7.1 (July 8, 2016)
   - Remove dependencies which are no longer needed for ruby-client
   - See full list @ https://github.com/nats-io/ruby-nats/compare/v0.7.0...v0.7.1
diff --git a/README.md b/README.md
index c6d4e8a8..c03c5829 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
 A [Ruby](http://ruby-lang.org) client for the [NATS messaging system](https://nats.io).
 
 [![License MIT](https://img.shields.io/npm/l/express.svg)](http://opensource.org/licenses/MIT)
-[![Build Status](https://travis-ci.org/nats-io/ruby-nats.svg)](http://travis-ci.org/nats-io/ruby-nats) [![Gem Version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=rb&type=5&v=0.8.0)](https://rubygems.org/gems/nats/versions/0.8.0) [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/nats-io/ruby-nats)
+[![Build Status](https://travis-ci.org/nats-io/ruby-nats.svg)](http://travis-ci.org/nats-io/ruby-nats) [![Gem Version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=rb&type=5&v=0.8.2)](https://rubygems.org/gems/nats/versions/0.8.2) [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/nats-io/ruby-nats)
 
 ## Supported Platforms
 
 This gem and the client are known to work on the following Ruby platforms:
 
-- MRI 1.9, 2.0, 2.1, 2.2, 2.3.0
+- MRI 1.9, 2.0, 2.1, 2.2, 2.3.0, 2.4.0
 - JRuby 9.1.2.0
 
 ## Getting Started