Master Server changes

I don't know if it works or not, just commit code