Add envelope to response (fixes #24)