Merge pull request #243 from rjynn/noMockServer

No mock server