Giving credits and stuff

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b279b32..6f00ab2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@ v3.07
 This version requires ElvUI 10.12 to run.
 Additions:
 - Affinitii's layout made its return to install. Keep in mind that this setup was not updated in years and can look not ideal. You'll need to change it a bit after applying.
+- Added an ption to change merchant frame into scrollable list. Based on a code from xMerchant addon by Nils Ruesch
 Fixes:
 - Fixed annoying whisper sound played when chat history was dumped
 - Fixed minimap coordinates options being greyed out when loc panel was disabled
diff --git a/ElvUI_SLE/locales/english.lua b/ElvUI_SLE/locales/english.lua
index 7f972a6..7dae1f3 100644
--- a/ElvUI_SLE/locales/english.lua
+++ b/ElvUI_SLE/locales/english.lua
@@ -856,6 +856,7 @@ Benik, The Slacker
 Blazeflack
 Boradan
 Camealion
+Nils Ruesch
 Omega1970
 Pvtschlag
 Simpy, The Heretic
diff --git a/ElvUI_SLE/skins/blizzard/merchantList.lua b/ElvUI_SLE/skins/blizzard/merchantList.lua
index 327b9d5..7434799 100644
--- a/ElvUI_SLE/skins/blizzard/merchantList.lua
+++ b/ElvUI_SLE/skins/blizzard/merchantList.lua
@@ -2,6 +2,7 @@
 local Sk = SLE:GetModule("Skins")
 local S = E:GetModule('Skins')
 --GLOBALS: CreateFrame, hooksecurefunc, ChatFontSmall, UIParent, INVSLOT_FIRST_EQUIPPED, INVSLOT_LAST_EQUIPPED
+--Rebuilding Merchant Frame as a scrollable list. Based on a code by Nils Ruesch (xMerchant addon)
 local _G = _G
 local strtrim = strtrim
 local GetLocale = GetLocale