diff --git a/setup.py b/setup.py
index 1ce4b3585..6738365e4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
-setup(name='slackclient',
-      version='0.16',
+setup(name='thieman-slackclient',
+      version='0.16.1',
       description='Python client for Slack.com',
       url='http://github.com/slackhq/python-slackclient',
       author='Ryan Huber',
diff --git a/slackclient/_client.py b/slackclient/_client.py
index 12d109bad..8fc97b2c5 100644
--- a/slackclient/_client.py
+++ b/slackclient/_client.py
@@ -43,10 +43,13 @@ def process_changes(self, data):
             if data["type"] == 'channel_created':
                 channel = data["channel"]
                 self.server.attach_channel(channel["name"], channel["id"], [])
-            if data["type"] == 'im_created':
+            elif data["type"] == 'im_created':
                 channel = data["channel"]
                 self.server.attach_channel(channel["user"], channel["id"], [])
-            if data["type"] == "team_join":
+            elif data["type"] == 'group_joined':
+                channel = data["channel"]
+                self.server.attach_channel(channel["name"], channel["id"], [])
+            elif data["type"] == "team_join":
                 user = data["user"]
                 self.server.parse_user_data([user])
             pass