diff --git a/README.md b/README.md
index 23d2f57..9de5a47 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,11 @@ Firefox打包安装
 更新日志
 -------
 
+`2018-02-15`
+
+* 修复随机播放在播放列表播放结束后自动停止的问题，开启无限洗脑循环（感谢@sunjie21的提交）
+* 增加将当前播放列表全部添加到歌单的功能 (感谢@sunjie21的提交)
+
 `2018-02-14`
 
 * 修复主页在加载更多数据时出现双重滚动条的bug，并修改了滚动条样式（感谢@zhuzhuyule的提交)
diff --git a/css/player.css b/css/player.css
index 503a110..18ec4fe 100644
--- a/css/player.css
+++ b/css/player.css
@@ -621,20 +621,36 @@ li {
     color: #ffffff;
 }
 
-.menu .remove-all {
-    display: inline-block;
-    position: absolute;
-    left: 113px;
-    top: 9px;
+.menu-header small {
+    background-color: #333333;
+    color: #ffffff;
+    cursor: pointer;
+    vertical-align: middle;
+    display:inline-block;
+    width: 60px;
+    line-height: 20px;
 }
 
+.menu-header a:hover small{
+    background-color: #ffffff;
+    color: #333333;
+}
 .menu .add-all {
     display: inline-block;
     position: absolute;
-    left: 175px;
+    left: 377px;
     top: 9px;
 }
 
+
+.menu .remove-all {
+    display: inline-block;
+    position: absolute;
+    left: 454px;
+    top: 9px;
+}
+
+
 .menu .close-popup {
     float:right;
     margin-right: 14px;
diff --git a/js/myplaylist.js b/js/myplaylist.js
index ea2b160..a848186 100644
--- a/js/myplaylist.js
+++ b/js/myplaylist.js
@@ -124,7 +124,13 @@ var create_myplaylist = function(playlist_title, track) {
 
     playlist.is_mine = 1;
     playlist.info = info;
-    playlist.tracks = [track];
+
+    if (Array.isArray(track)) {
+        playlist.tracks = track;
+    } else {
+        playlist.tracks = [track];
+    }
+
     save_myplaylist(playlist);
 }
 
diff --git a/listen1.html b/listen1.html
index 9011534..7e5e684 100644
--- a/listen1.html
+++ b/listen1.html
@@ -466,8 +466,8 @@
         <div class="menu" ng-hide="menuHidden">
           <div class="menu-header">
               <span>播放列表</span>
-              <a clear-playlist class="remove-all"><small>(移除所有</small></a>
-              <a class="add-all" ng-click="showDialog(0, playlist)"><small>添加所有到歌单)</small></a>
+              <a class="add-all" ng-click="showDialog(0, playlist)"><small>收藏全部</small></a>
+              <a clear-playlist class="remove-all"><small>清空</small></a>
               <a class="close-popup" ng-click="menuHidden=!menuHidden">×</a>
           </div>
           <ul>