stamps implemented for envelopes + tests
cleanup array_merge and scalar check
Merge pull request #1 from udsholt/envelope-stamps

Stamps for envelopes