diff --git a/.travis.yml b/.travis.yml
index 12425c30..deb9ce36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,3 +23,7 @@ matrix:
 
 git:
   submodules: false
+
+before_install:
+  - gem update bundler
+  - gem update --system
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67f839ce..0d4ebd6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### 0.7.4 (Next)
 
 * Your contribution here.
+* [#93](https://github.com/dblock/slack-ruby-client/pull/93): Fix: When using Celluloid concurrency, handle input from the TCP socket asynchronously from reading more. - [@benzrf](https://github.com/benzrf).
 
 ### 0.7.3 (5/14/2016)
 
diff --git a/lib/slack/real_time/concurrency/celluloid.rb b/lib/slack/real_time/concurrency/celluloid.rb
index d835ef46..78b5d2f4 100644
--- a/lib/slack/real_time/concurrency/celluloid.rb
+++ b/lib/slack/real_time/concurrency/celluloid.rb
@@ -47,6 +47,10 @@ def close
 
           def read
             buffer = socket.readpartial(BLOCK_SIZE)
+            async.handle_read(buffer)
+          end
+
+          def handle_read(buffer)
             logger.debug("#{self.class}##{__method__}") { buffer }
             driver.parse buffer
           end