set delivery_method and default from
Add test for julien modifications. (Thx)
Merge pull request #9 from ombr/from_and_delivery_method

From and delivery method