Syntactic changes to shipments interface.
Merge pull request #2 from Alex0216/mhotan

Syntactic changes to shipments interface.