Add preparation for provider (bug 942361)
Merge pull request #74 from muffinresearch/add-provider-handling

Add preparation for provider (bug 942361)