Improve service provider.
Merge pull request #44 from franzliedke/patch-1

Improve service provider.