some changes to the service registry
Merge pull request #74 from EricWittmann/service-registry

some changes to the service registry