Thanks to MrLama for small cleanups and patch updating. Signed-off-by: VladimirMangos <vladimir@getmangos.com>