Adding server override
Merge pull request #55 from oldmantaiter/oldmantaiter/add-server-override

Adding server override