Possible servers are automatically announced to the master server, however they seem to remain listed until they time out. While this is good by itself, it would be better to also add a hook which will remove a given server off the master server when the server stops to pose as such, i.e. when the menu for hosting a server game is closed. This could possibly prevent that you see your own computer in the server list when returning from the menu where you configure a server.
I guess that's not very well explained, feel free to ask if anything needs better explanations.