Merge pull request #10 from marcel-blonk/develop

Getting javaclient to work in services