Add Shipment Confirmation, Refactor
Improve require
Merges from master