Merge pull request #296 from FWAJL/dev

dev to feature
Merge pull request #300 from FWAJL/feature_service_providers

Merge pull request #296 from FWAJL/dev