diff --git a/AUTHORS.md b/AUTHORS.md
index fe8d32e4..034d67e2 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -25,5 +25,6 @@
 - anonymlol <anonymlol7@gmail.com>
 - Gediminas Petrikas <gedas18@gmail.com>
 - Adam Gotlib <gotlib.adam+dev@gmail.com>
+- Rémi Jouannet <remijouannet@gmail.com>
 
 #### Generated by bin/update-authors.sh.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b323a86..5db417f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # WebTorrent Desktop Version History
 
+## v0.9.0 - 2016-07-20
+
+### Added
+- Save selected subtitles
+- Ask for confirmation before deleting torrents
+- Support Debian Jessie
+
+### Changed
+- Only send telemetry in production
+- Clean up the code. Split main.js, refactor lots of things
+
+### Fixed
+- Fix state.playing.jumpToTime behavior
+- Remove torrent file and poster image when deleting a torrent
+
 ## v0.8.1 - 2016-06-24
 
 ### Added
diff --git a/package.json b/package.json
index e5797752..b3f266db 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "webtorrent-desktop",
   "description": "WebTorrent, the streaming torrent client. For OS X, Windows, and Linux.",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "author": {
     "name": "WebTorrent, LLC",
     "email": "feross@webtorrent.io",
diff --git a/renderer/controllers/playback-controller.js b/renderer/controllers/playback-controller.js
index d6679ee7..204557f9 100644
--- a/renderer/controllers/playback-controller.js
+++ b/renderer/controllers/playback-controller.js
@@ -54,8 +54,8 @@ module.exports = class PlaybackController {
 
     // force rerendering if window is hidden,
     // in order to bypass `raf` and play/pause media immediately
-    if (!state.window.isVisible) {
-      var mediaTag = document.querySelector('video,audio')
+    var mediaTag = document.querySelector('video,audio')
+    if (!state.window.isVisible && mediaTag) {
       if (state.playing.isPaused) mediaTag.play()
       else mediaTag.pause()
     }
diff --git a/renderer/views/player.js b/renderer/views/player.js
index f43dff3d..3c80d035 100644
--- a/renderer/views/player.js
+++ b/renderer/views/player.js
@@ -524,6 +524,7 @@ function renderPlayerControls (state) {
 
   // Handles a click or drag to scrub (jump to another position in the video)
   function handleScrub (e) {
+    if (!e.clientX) return
     dispatch('mediaMouseMoved')
     var windowWidth = document.querySelector('body').clientWidth
     var fraction = e.clientX / windowWidth