diff --git a/Changelog.md b/Changelog.md
index 958620d..36fae53 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,5 @@
 
-5.4.8.7 Beta (2021-03-??)
+5.4.8.7 Beta (2021-03-09)
 =========================
 
 - History feature can be configured to ingore defined strings:
@@ -8,7 +8,8 @@
 - On Windows 10 1903 and later the default code page was changed to UTF-8.
 - Support of --version command.
 - File associations and auto-load-folder can be customized with
-  video-file-extensions, audio-file-extensions and image-file-extensions
+  video-file-extensions, audio-file-extensions and image-file-extensions.
+- Fix menu not showing key '&'.
 
 
 5.4.8.6 Beta (2020-12-24)
diff --git a/mpv.net/Misc/App.cs b/mpv.net/Misc/App.cs
index 965f741..044670b 100644
--- a/mpv.net/Misc/App.cs
+++ b/mpv.net/Misc/App.cs
@@ -101,7 +101,7 @@ namespace mpvnet
 
         public static string Version {
             get {
-                return "Copyright (C) 2000-2020 mpv.net/mpv/mplayer\n" +
+                return "Copyright (C) 2000-2021 mpv.net/mpv/mplayer\n" +
                     $"mpv.net {Application.ProductVersion} ({File.GetLastWriteTime(Application.ExecutablePath).ToShortDateString()})\n" +
                     $"{core.get_property_string("mpv-version")} ({File.GetLastWriteTime(Folder.Startup + "mpv-1.dll").ToShortDateString()})\nffmpeg {core.get_property_string("ffmpeg-version")}\nMIT License";
             }
diff --git a/mpv.net/Properties/AssemblyInfo.cs b/mpv.net/Properties/AssemblyInfo.cs
index 535dafe..f2ff31e 100644
--- a/mpv.net/Properties/AssemblyInfo.cs
+++ b/mpv.net/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("mpv.net")]
 [assembly: AssemblyDescription("mpv based media player")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Frank Skare (stax76)")]
+[assembly: AssemblyCompany("mpv.net/mpv/mplayer")]
 [assembly: AssemblyProduct("mpv.net")]
-[assembly: AssemblyCopyright("Copyright (C) 2017-2020 Frank Skare (stax76)")]
+[assembly: AssemblyCopyright("Copyright (C) 2000-2021 mpv.net/mpv/mplayer")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.8.6")]
-[assembly: AssemblyFileVersion("5.4.8.6")]
+[assembly: AssemblyVersion("5.4.8.7")]
+[assembly: AssemblyFileVersion("5.4.8.7")]
diff --git a/mpv.net/WinForms/MainForm.cs b/mpv.net/WinForms/MainForm.cs
index a375e14..2ad7a5a 100644
--- a/mpv.net/WinForms/MainForm.cs
+++ b/mpv.net/WinForms/MainForm.cs
@@ -466,9 +466,7 @@ namespace mpvnet
                 if (string.IsNullOrEmpty(item.Path))
                     continue;
 
-                string path = item.Path.Replace("&", "&&");
-
-                MenuItem menuItem = ContextMenu.Add(path, () => {
+                MenuItem menuItem = ContextMenu.Add(item.Path.Replace("&", "&&"), () => {
                     try {
                         core.command(item.Command);
                     } catch (Exception ex) {
@@ -477,7 +475,7 @@ namespace mpvnet
                 });
 
                 if (menuItem != null)
-                    menuItem.ShortcutKeyDisplayString = item.Input + "    ";
+                    menuItem.ShortcutKeyDisplayString = item.Input.Replace("&", "&&") + "    ";
             }
         }