Merge pull request #44 from giolekva/server_handling

Multiple server support