diff --git a/README.md b/README.md
index 71507841..5e92b333 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![stable version](https://img.shields.io/badge/stable_version-2.7.14-blue.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/stable/repository.plexkodiconnect/repository.plexkodiconnect-1.0.2.zip) 
-[![beta version](https://img.shields.io/badge/beta_version-2.7.17-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
+[![beta version](https://img.shields.io/badge/beta_version-2.7.18-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
 
 [![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/Installation)
 [![FAQ](https://img.shields.io/badge/wiki-FAQ-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/faq)
diff --git a/addon.xml b/addon.xml
index 74dd4ae3..8cfa7d2a 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.7.17" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.7.18" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -77,7 +77,13 @@
     <summary lang="uk_UA">Нативна інтеграція Plex в Kodi</summary>
     <description lang="uk_UA">Підключає Kodi до серверу Plex. Цей плагін передбачає, що ви керуєте всіма своїми відео за допомогою Plex (і ніяк не Kodi). Ви можете втратити дані, які вже зберігаються у відео та музичних БД Kodi (оскільки цей плагін безпосередньо їх змінює). Використовуйте на свій страх і ризик!</description>
     <disclaimer lang="uk_UA">Використовуйте на свій ризик</disclaimer>
-    <news>version 2.7.17 (beta only):
+    <news>version 2.7.18 (beta only):
+- Fix Kodi always playing the same file version of a video if several are present
+- Also play trailers if user chose to resume movie from the beginning
+- Ask user whether to resume if using Direct Paths and user initiated playback via PMS
+- Fix video thrown by Plex Companion not resuming
+
+version 2.7.17 (beta only):
 - Another attempt to keep Kodi from crashing on playback startup
 
 version 2.7.16 (beta only):
diff --git a/changelog.txt b/changelog.txt
index a3692bbc..d952ce20 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+version 2.7.18 (beta only):
+- Fix Kodi always playing the same file version of a video if several are present
+- Also play trailers if user chose to resume movie from the beginning
+- Ask user whether to resume if using Direct Paths and user initiated playback via PMS
+- Fix video thrown by Plex Companion not resuming
+
 version 2.7.17 (beta only):
 - Another attempt to keep Kodi from crashing on playback startup