Use Envelope everywhere internally
Merge pull request #45 from henrikbjorn/serviceresolver-refactor

Use Envelope everywhere internally