diff --git a/README b/README
index 20c3095..524b6bc 100644
--- a/README
+++ b/README
@@ -2,3 +2,39 @@
 https://github.com/nlohmann/json
 Release - 3.10.5
 Commit - 4f8fba14066156b73f1189a2b8bd568bde5284c5
+
+--- id3edit ---
+https://github.com/rstemmer/id3edit
+For MP3 tagging
+id3edit
+	--set-name "Title"
+	--set-album "Album"
+	--set-artist "Artist"
+	--set-track "Track Number"
+	--set-artwork "/path/to/cover"
+	file.mp3
+
+--- metaflac ---
+https://xiph.org/flac/download.html
+For FLAC tagging
+metaflac
+	// Common
+	--preserve-modtime
+	--no-utf8-convert
+
+	// First Step - Remove
+	--remove --block-type=PICTURE
+	--remove-tag=TITLE
+	--remove-tag=ARTIST
+	--remove-tag=ALBUM
+	--remove-tag=TRACKNUMBER
+
+	// Second Step - Add
+	--import-picture-from=3|image/jpeg|||"/path/to/cover"
+	"--set-tag=TITLE=..."
+	"--set-tag=ARTIST=..."
+	"--set-tag=ALBUM=..."
+	"--set-tag=TRACKNUMBER=..."
+	--dont-use-padding
+
+	file.flac
diff --git a/main.cpp b/main.cpp
index 900f1af..0bd916e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -327,7 +327,8 @@ string get_release_dir_name(const string& main_path, int release_num,
 	return path;
 }
 
-string get_track_filename(int track_num, const string& artist, const string& title)
+string get_track_filename(int track_num, const string& artist,
+	const string& title, const string& album_artist)
 {
 	string filename;
 
@@ -337,7 +338,8 @@ string get_track_filename(int track_num, const string& artist, const string& tit
 		filename += " - ";
 	}
 
-	if ((artist != "Monstercat") && (artist != "Various Artists"))
+	if ((artist != "Monstercat") && (artist != "Various Artists") &&
+		(artist != album_artist))
 	{
 		filename += artist;
 		filename += " - ";
@@ -435,7 +437,7 @@ bool full_donwload(const string& path, const string& release_prefix,
 	for (int i = 0; i < info["Tracks"].size(); ++i)
 	{
 		track_filename = get_track_filename(info["Tracks"][i]["TrackNumber"],
-			tags[i].artist, tags[i].title);
+			tags[i].artist, tags[i].title, release_artist_title.first);
 
 		// Download Track (MP3)
 		ok = download_track(info["Release"]["Id"], info["Tracks"][i]["Id"],