Mergen

Hello i'm start work on you repo mergen with my repo for Arena Spectator fix :) or more :+1: