From 4d6179dfddf2dc304f87e2872eb0cb94a949d77b Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Mon, 14 Nov 2016 20:49:01 -0800
Subject: [PATCH 1/4] Fix typo

---
 data/interfaces/default/edit_user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/interfaces/default/edit_user.html b/data/interfaces/default/edit_user.html
index d912a788..859a21b1 100644
--- a/data/interfaces/default/edit_user.html
+++ b/data/interfaces/default/edit_user.html
@@ -45,7 +45,7 @@ DOCUMENTATION :: END
                             <input type="text" class="form-control" id="friendly_name" name="friendly_name" value="${data['friendly_name']}" size="30">
                         </div>
                     </div>
-                    <p class="help-block">Replace all occurances of the username with this name.</p>
+                    <p class="help-block">Replace all occurrences of the username with this name.</p>
                 </div>
                 <div class="form-group">
                     <label for="profile_url">Profile Picture URL</label>

From 8c7c0101cd1c5953d09bac6ae8a4676cd4172b8f Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Mon, 14 Nov 2016 21:10:48 -0800
Subject: [PATCH 2/4] Dynamically update stream and transcoder tooltip percent

---
 data/interfaces/default/index.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index d7a597b8..7724ed62 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -204,8 +204,11 @@
 
                         // update the progress bars
                         // percent - 3 because of 3px padding-right
-                        $('#bufferbar-' + key).width(parseInt(s.transcode_progress) - 3 + '%').html(s.transcode_progress + '%');
-                        $('#bar-' + key).width(parseInt(s.progress_percent) - 3 + '%').html(s.progress_percent + '%');
+                        $('#bufferbar-' + key).width(parseInt(s.transcode_progress) - 3 + '%').html(s.transcode_progress + '%')
+                            .attr('data-original-title', 'Transcoder Progress ' + s.transcode_progress + '%');
+                        $('#bar-' + key).width(parseInt(s.progress_percent) - 3 + '%').html(s.progress_percent + '%')
+                            .attr('data-original-title', 'Stream Progress ' + s.progress_percent + '%');
+
 
                         // add temporary class so we know which instances are still active
                         instance.addClass('updated-temp');

From 82ac33dd757794020008fe498d4d86f802657146 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Fri, 25 Nov 2016 18:42:23 -0800
Subject: [PATCH 3/4] Fix websocket for new json response on PMS 1.3.0

---
 plexpy/web_socket.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plexpy/web_socket.py b/plexpy/web_socket.py
index 451dee60..6772fa05 100644
--- a/plexpy/web_socket.py
+++ b/plexpy/web_socket.py
@@ -142,11 +142,12 @@ def process(opcode, data):
 
     try:
         info = json.loads(data)
-    except Exception as ex:
-        logger.warn(u"PlexPy WebSocket :: Error decoding message from websocket: %s" % ex)
+    except Exception as e:
+        logger.warn(u"PlexPy WebSocket :: Error decoding message from websocket: %s" % e)
         logger.debug(data)
         return False
 
+    info = info.get('NotificationContainer', info)
     type = info.get('type')
 
     if not type:
@@ -154,9 +155,9 @@ def process(opcode, data):
 
     if type == 'playing':
         # logger.debug('%s.playing %s' % (name, info))
-        try:
-            time_line = info.get('_children')
-        except:
+        time_line = info.get('PlaySessionStateNotification', info.get('_children'))
+
+        if not time_line:
             logger.debug(u"PlexPy WebSocket :: Session found but unable to get timeline data.")
             return False
 

From 3742f33d08feb6fb15e74af6318185230205006f Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Fri, 25 Nov 2016 18:47:22 -0800
Subject: [PATCH 4/4] v1.4.16

---
 CHANGELOG.md      | 7 +++++++
 plexpy/version.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4737bb73..a6a227a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.4.16 (2016-11-25)
+
+* Fix: Websocket for new json response on PMS 1.3.0.
+* Fix: Update stream and transcoder tooltip percent.
+* Fix: Typo in the edit user modal.
+
+
 ## v1.4.15 (2016-11-11)
 
 * New: Add stream and transcoder progress percent to the current activity tooltip.
diff --git a/plexpy/version.py b/plexpy/version.py
index 8af7df98..753ab1b2 100644
--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.4.15"
+PLEXPY_RELEASE_VERSION = "1.4.16"