Updated server config @ master