Improve the service provider
Merge pull request #22 from bramdevries/improved-service-provider

Improve the service provider