Merge pull request #110 from bitol-io/andrewrjones-service-provider