Forgot to commit servermaster in last commit