Merge pull request #23 from Izakey/develop

Optimize demo-server to run services in less time